Skip to content

update for node 0.8.14 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crcn wants to merge 4 commits into
base: master
Choose a base branch
from
Open

update for node 0.8.14 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecf1aad
require dep bufferjs < 2.0.0
Nov 3, 2012
63a19c5
Update for n 0.8.14
Nov 4, 2012
fdfb64f
Update package.json
Nov 4, 2012
f496875
fix issue where content wouldn't be returned
Nov 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions lib/proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var http = require('http')
, zlib = require('zlib')
, sniparse = require('./sniparse');

require('bufferjs/concat');
require('bufferjs/add-chunk');
require('./regexp-escape');

Expand Down Expand Up @@ -136,10 +135,11 @@ module.exports.createProxyServer = function (opts) {
var isHtml = (proxyResponse.headers['content-type'] &&
proxyResponse.headers['content-type'].toLowerCase().indexOf("html") != -1);


var writeResponse = function (shouldBuffer) {
var buffer = undefined, bufferLength = 0;
var buffer = undefined, buffers = [], bufferLength = 0;
if (shouldBuffer) {
bufferLength = ~~(proxyResponse.headers['content-length'] || 0);
bufferLength = 0;//~~(proxyResponse.headers['content-length'] || 0);
delete proxyResponse.headers['content-length'];
buffer = new Buffer(0);
}
Expand All @@ -150,8 +150,10 @@ module.exports.createProxyServer = function (opts) {
});

proxyResponse.on('data', function (chunk) {
bufferLength += chunk.length;
if (shouldBuffer) {
buffer = Buffer.concat(buffer, chunk);
// buffer = Buffer.concat(buffer, chunk);
buffers.push(chunk);
} else {
response.write(chunk);
}
Expand Down Expand Up @@ -193,6 +195,8 @@ module.exports.createProxyServer = function (opts) {
emitOrRun('interceptResponseContent', function () { writeResponse(newBuffer); },
newBuffer, proxyResponse, isSsl, charset, writeResponse);
};

buffer = Buffer.concat(buffers, bufferLength);
switch (responseEncoding) {
case 'gzip':
zlib.gunzip(buffer, setupIntercept);
Expand Down Expand Up @@ -340,7 +344,7 @@ module.exports.createProxyServer = function (opts) {
socket.write('HTTP/1.0 200 Connection established\r\n\r\n');
}
} catch (error) {
emitter.emit('error', error, 'httpsSocketConnect');
emitter.emit('error', error, 'httpsSocket');
}
});

Expand All @@ -355,11 +359,6 @@ module.exports.createProxyServer = function (opts) {
}
});

clientSocket.on('error', function (error) {
socket.end();
emitter.emit('error', error, 'httpsClientSocket');
});

clientSocket.on('end', function () { socket.end(); });

socket.on('data', function (data) {
Expand All @@ -372,12 +371,6 @@ module.exports.createProxyServer = function (opts) {
emitter.emit('error', error, 'httpsClientSocketData');
}
});

socket.on('error', function (error) {
clientSocket.end();
emitter.emit('error', error, 'httpsSocket');
});

socket.on('end', function () { clientSocket.end(); });
};

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"homepage": "https://github.com/axiak/filternet",
"bugs": "https://github.com/axiak/filternet/issues",
"dependencies": {
"bufferjs": ">= 1.0.0"
"bufferjs": ">1.0.0"
},
"main": "index",
"license": "BSD",
Expand Down