Improve keepAlive: handles proxy-connection header & don't force

connection header

Author: felicienfrancois

lib/proxy.js

@@ -263,11 +263,12 @@ Proxy.prototype._onHttpServerConnect = function(req, socket, head) {
 
   // we need first byte of data to detect if request is SSL encrypted
   if (!head || head.length === 0) {
-    socket.once('data', function(data) {
-      self._onHttpServerConnect(req, socket, data);
-    });
-    // respond to the client that the connection was made so it can send us data
-    return socket.write('HTTP/1.1 200 OK\r\n\r\n');
+    socket.once('data', self._onHttpServerConnect.bind(self, req, socket));
+    socket.write('HTTP/1.1 200 OK\r\n');
+    if (self.keepAlive && req.headers['proxy-connection'] === 'keep-alive') {
+      socket.write('Proxy-Connection: Keep-Alive\r\n');
+    }
+    return socket.write('\r\n');
   }
 
   socket.pause();
@@ -709,9 +710,8 @@ Proxy.prototype._onHttpServerRequest = function(isSSL, clientToProxyRequest, pro
       ctx.serverToProxyResponse.headers['transfer-encoding'] = 'chunked';
       delete ctx.serverToProxyResponse.headers['content-length'];
       if (self.keepAlive) {
-        if (!ctx.serverToProxyResponse.headers['connection']) {
-          var keepAlive = ctx.clientToProxyRequest.headers && ctx.clientToProxyRequest.headers['connection'] && ctx.clientToProxyRequest.headers['connection'].trim().toLowerCase() === 'keep-alive';
-          ctx.serverToProxyResponse.headers['connection'] = keepAlive ? 'keep-alive' : 'close';
+        if (ctx.clientToProxyRequest.headers['proxy-connection']) {
+          ctx.serverToProxyResponse.headers['proxy-connection'] = 'keep-alive';
         }
       } else {
         ctx.serverToProxyResponse.headers['connection'] = 'close';