[fix minor] Correctly set x-forwarded-proto in WebSocket requests

http-party · Dec 23, 2011 · c81bae2 · c81bae2
1 parent 6f8ad3b
commit c81bae2
Showing 1 changed file with 30 additions and 28 deletions.
diff --git a/lib/node-http-proxy/http-proxy.js b/lib/node-http-proxy/http-proxy.js
@@ -131,28 +131,29 @@ HttpProxy.prototype.proxyRequest = function (req, res, buffer) {
   // * `x-forwarded-port`: Port of the original request.
   //
   if (this.enable.xforward && req.connection && req.socket) {
-
     if (req.headers['x-forwarded-for']){
-        var addressToAppend = "," + req.connection.remoteAddress || req.socket.remoteAddress;
-        req.headers['x-forwarded-for']   += addressToAppend;
-    } else {
-        req.headers['x-forwarded-for']   = req.connection.remoteAddress || req.socket.remoteAddress;
+      var addressToAppend = "," + req.connection.remoteAddress || req.socket.remoteAddress;
+      req.headers['x-forwarded-for'] += addressToAppend;
+    } 
+    else {
+      req.headers['x-forwarded-for'] = req.connection.remoteAddress || req.socket.remoteAddress;
     }
 
     if (req.headers['x-forwarded-port']){
-        var portToAppend = "," + req.connection.remotePort || req.socket.remotePort;
-        req.headers['x-forwarded-port']   += portToAppend;
-    } else {
-        req.headers['x-forwarded-port']   = req.connection.remotePort || req.socket.remotePort;
+      var portToAppend = "," + req.connection.remotePort || req.socket.remotePort;
+      req.headers['x-forwarded-port'] += portToAppend;
+    } 
+    else {
+      req.headers['x-forwarded-port'] = req.connection.remotePort || req.socket.remotePort;
     }
 
     if (req.headers['x-forwarded-proto']){
-        var protoToAppend = "," + req.connection.pair ? 'https' : 'http';
-        req.headers['x-forwarded-proto']   += protoToAppend;
-    } else {
-        req.headers['x-forwarded-proto']   = req.connection.pair ? 'https' : 'http';
+      var protoToAppend = "," + req.connection.pair ? 'https' : 'http';
+      req.headers['x-forwarded-proto'] += protoToAppend;
+    } 
+    else {
+      req.headers['x-forwarded-proto'] = req.connection.pair ? 'https' : 'http';
     }
-
   }
 
   //
@@ -420,28 +421,29 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
   // * `x-forwarded-port`: Port of the original request.
   //
   if (this.enable.xforward && req.connection && req.connection.socket) {
-
     if (req.headers['x-forwarded-for']){
-        var addressToAppend = "," + req.connection.remoteAddress || req.connection.socket.remoteAddress;
-        req.headers['x-forwarded-for']   += addressToAppend;
-    } else {
-        req.headers['x-forwarded-for']   = req.connection.remoteAddress || req.connection.socket.remoteAddress;
+      var addressToAppend = "," + req.connection.remoteAddress || req.connection.socket.remoteAddress;
+      req.headers['x-forwarded-for'] += addressToAppend;
+    } 
+    else {
+      req.headers['x-forwarded-for'] = req.connection.remoteAddress || req.connection.socket.remoteAddress;
     }
 
     if (req.headers['x-forwarded-port']){
-        var portToAppend = "," + req.connection.remotePort || req.connection.socket.remotePort;
-        req.headers['x-forwarded-port']   += portToAppend;
-    } else {
-        req.headers['x-forwarded-port']   = req.connection.remotePort || req.connection.socket.remotePort;
+      var portToAppend = "," + req.connection.remotePort || req.connection.socket.remotePort;
+      req.headers['x-forwarded-port'] += portToAppend;
+    } 
+    else {
+      req.headers['x-forwarded-port'] = req.connection.remotePort || req.connection.socket.remotePort;
     }
 
     if (req.headers['x-forwarded-proto']){
-        var protoToAppend = "," + req.connection.pair ? 'https' : 'http';
-        req.headers['x-forwarded-proto']   += protoToAppend;
-    } else {
-        req.headers['x-forwarded-proto']   = req.connection.pair ? 'https' : 'http';
+      var protoToAppend = "," + req.connection.pair ? 'wss' : 'ws';
+      req.headers['x-forwarded-proto'] += protoToAppend;
+    } 
+    else {
+      req.headers['x-forwarded-proto'] = req.connection.pair ? 'wss' : 'ws';
     }
-
   }
 
   //