README.md

@@ -38,7 +38,7 @@ An object will be returned with four values:
 * listen `port` (a function that wraps the object in a webserver, for your convenience)
 * close `[callback]` (a function that closes the inner webserver and stops listening on given port)
 
-Is it then possible to proxy requests by calling these functions
+It is then possible to proxy requests by calling these functions
 
 ```javascript
 http.createServer(function(req, res) {
@@ -190,6 +190,7 @@ http.createServer(function (req, res) {
 
 * `error`: The error event is emitted if the request to the target fail.
 * `proxyRes`: This event is emitted if the request to the target got a response.
+* `proxySocket`: This event is emitted once the proxy websocket was created and piped into the target websocket.
 
 ```js
 var httpProxy = require('http-proxy');
@@ -220,6 +221,13 @@ proxy.on('proxyRes', function (proxyRes, req, res) {
   console.log('RAW Response from the target', JSON.stringify(proxyRes.headers, true, 2));
 });
 
+//
+// Listen for the `proxySocket` event on `proxy`.
+//
+proxy.on('proxySocket', function (proxySocket) {
+  // listen for messages coming FROM the target here
+  proxySocket.on('data', hybiParseAndLogMessage);
+});
 ```
 
 #### Using HTTPS
@@ -315,13 +323,13 @@ proxyServer.listen(8015);
  *  **forward**: url string to be parsed with the url module
  *  **agent**: object to be passed to http(s).request (see Node's [https agent](http://nodejs.org/api/https.html#https_class_https_agent) and [http agent](http://nodejs.org/api/http.html#http_class_http_agent) objects)
  *  **secure**: true/false, if you want to verify the SSL Certs
+ *  **xfwd**: true/false, adds x-forward headers
+ *  **toProxy**: passes the absolute URL as the `path` (useful for proxying to proxies)
 
 If you are using the `proxyServer.listen` method, the following options are also applicable:
 
  *  **ssl**: object to be passed to https.createServer()
  *  **ws**: true/false, if you want to proxy websockets
- *  **xfwd**: true/false, adds x-forward headers
- *  **toProxy**: passes the absolute URL as the `path` (useful for proxying to proxies)
 
 ### Shutdown
 

lib/http-proxy/common.js

@@ -2,6 +2,7 @@ var common = exports,
     url    = require('url'),
     extend = require('util')._extend;
 
+var upgradeHeader = /(^|,)\s*upgrade\s*($|,)/i;
 /**
  * Copies the right headers from `options` and `req` to
  * `outgoing` which is then used to fire the proxied
@@ -53,7 +54,7 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
   if (!outgoing.agent) {
     outgoing.headers = outgoing.headers || {};
     if (typeof outgoing.headers.connection !== 'string'
-        || outgoing.headers.connection.toLowerCase() !== 'upgrade'
+        || !upgradeHeader.test(outgoing.headers.connection)
        ) { outgoing.headers.connection = 'close'; }
   }
 

lib/http-proxy/passes/ws-incoming.js

@@ -108,6 +108,7 @@ var passes = exports;
         return i + ": " + proxyRes.headers[i];
       }).join('\r\n') + '\r\n\r\n');
       proxySocket.pipe(socket).pipe(proxySocket);
+      server.emit('proxySocket', proxySocket);
     });
 
     return proxyReq.end(); // XXX: CHECK IF THIS IS THIS CORRECT

package.json

@@ -1,6 +1,6 @@
 {
   "name"           : "http-proxy",
-  "version"        : "1.4.3",
+  "version"        : "1.5.0",
 
   "repository"     : {
     "type"              : "git",

test/lib-http-proxy-common-test.js

@@ -59,6 +59,49 @@ describe('lib/http-proxy/common.js', function () {
       expect(outgoing.headers.connection).to.eql('upgrade');
     });
 
+    it('should not override agentless connection: contains upgrade', function () {
+      var outgoing = {};
+      common.setupOutgoing(outgoing,
+        {
+          agent: undefined,
+          target: {
+            host      : 'hey',
+            hostname  : 'how',
+            socketPath: 'are',
+            port      : 'you',
+          },
+          headers: {'connection': 'keep-alive, upgrade'}, // this is what Firefox sets
+        },
+        {
+          method    : 'i',
+          url      : 'am',
+          headers   : {'pro':'xy','overwritten':false}
+        });
+      expect(outgoing.headers.connection).to.eql('keep-alive, upgrade');
+    });
+
+    it('should override agentless connection: contains improper upgrade', function () {
+      // sanity check on upgrade regex
+      var outgoing = {};
+      common.setupOutgoing(outgoing,
+        {
+          agent: undefined,
+          target: {
+            host      : 'hey',
+            hostname  : 'how',
+            socketPath: 'are',
+            port      : 'you',
+          },
+          headers: {'connection': 'keep-alive, not upgrade'},
+        },
+        {
+          method    : 'i',
+          url      : 'am',
+          headers   : {'pro':'xy','overwritten':false}
+        });
+      expect(outgoing.headers.connection).to.eql('close');
+    });
+
     it('should override agentless non-upgrade header to close', function () {
       var outgoing = {};
       common.setupOutgoing(outgoing,