[fix] merge #495, thanks @glasser

Author: yawnt

Diff for: lib/http-proxy.js

@@ -36,7 +36,7 @@ proxy.createProxyServer = proxy.createServer = function createProxyServer(option
    *    `options.target and `options.forward` cannot be    
    *    both missing                                       
    *  }
-  */
+   */
 
   return new httpProxy.Server(options);
 };

Diff for: lib/http-proxy/passes/ws-incoming.js

@@ -106,15 +106,11 @@ var passes = exports;
       common.setupOutgoing(options.ssl || {}, options, req)
     );
     // Error Handler
-    proxyReq.on('error', function(err){
-      if (clb) {
-        clb(err);
-      } else {
-        server.emit('error', err, req, res);
-      }
-    });
+    proxyReq.on('error', onError);
 
     proxyReq.on('upgrade', function(proxyRes, proxySocket, proxyHead) {
+      proxySocket.on('error', onError);
+
       common.setupSocket(proxySocket);
 
       if (proxyHead && proxyHead.length) proxySocket.unshift(proxyHead);
@@ -126,7 +122,15 @@ var passes = exports;
       proxySocket.pipe(socket).pipe(proxySocket);
     });
 
-    proxyReq.end(); // XXX: CHECK IF THIS IS THIS CORRECT
+    return proxyReq.end(); // XXX: CHECK IF THIS IS THIS CORRECT
+
+    function onError(err) {
+      if (clb) {
+        clb(err);
+      } else {
+        server.emit('error', err, req, res);
+      }
+    }
   }
 
 ] // <--