archive-gh-me/node-http-proxy
1
0
Fork 0
mirror of https://github.com/http-party/node-http-proxy.git synced 2025-12-08 20:59:18 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[fix] fixed passes functions, now 'this' can be used and options are stored on 'this.options'"

Browse Source 
This reverts commit 9b3e1eb247df29d18ea299ff4ebb2f10eeb71269.
This commit is contained in:
cronopio 2013-10-21 14:49:39 -05:00
parent babdf531fe
commit 5e130de854
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/http-proxy/passes/ws-incoming.js
View File

@ -64,13 +64,12 @@ var passes = exports;
*
* @param {ClientRequest} Req Request object
* @param {Socket} Websocket
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/
function XHeaders(req, socket) {
// Now the options are stored on this
var options = this.options;
function XHeaders(req, socket, options) {
if(!options.xfwd) return;
var values = {
@ -93,11 +92,11 @@ var passes = exports;
*
* @param {ClientRequest} Req Request object
* @param {Socket} Websocket
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/
function stream(req, socket, head, clb) {
var server = this;
function stream(req, socket, server, head, clb) {
common.setupSocket(socket);
if (head && head.length) socket.unshift(head);

8
test/lib-http-proxy-test.js
View File

@ -122,7 +122,7 @@ describe('lib/http-proxy.js', function() {
proxy.on('error', function (err) {
expect(err).to.be.an(Error);
expect(err.code).to.be('ECONNREFUSED');
proxy._server.close();
proxyServer._server.close();
done();
})
@ -148,7 +148,9 @@ describe('lib/http-proxy.js', function() {
setTimeout(function () {
res.end('At this point the socket should be closed');
}, 5)
}).listen('8080');
});
source.listen('8080');
var testReq = http.request({
hostname: '127.0.0.1',
@ -159,8 +161,6 @@ describe('lib/http-proxy.js', function() {
testReq.on('error', function (e) {
expect(e).to.be.an(Error);
expect(e.code).to.be.eql('ECONNRESET');
proxy._server.close();
source.close();
done();
});