Merge pull request #47 from chimurai/Fix-Server-Crash-on-WS-Proxy-Ser…

…ver-Connection-Close fix(handlers.js): server crash when target ws server closes.
chimurai · Jan 18, 2016 · 9d083fb · 9d083fb
2 parents d185278 + 30c0c68
commit 9d083fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -110,8 +110,10 @@ var httpProxyMiddleware = function (context, opts) {
     }
 
     function proxyErrorLogger (err, req, res) {
+        var hostname = (req.hostname || req.host) || (req.headers && req.headers.host) // (node0.10 || node 4/5) || (websocket)
         var targetUri = proxyOptions.target.host + req.url;
-        logger.error('[HPM] Proxy error: %s. %s -> "%s"', err.code, req.hostname, targetUri);
+
+        logger.error('[HPM] Proxy error: %s. %s -> "%s"', err.code, hostname, targetUri);
     }
 
 };

diff --git a/lib/handlers.js b/lib/handlers.js
@@ -4,8 +4,10 @@ module.exports = {
 
 function proxyError (err, req, res) {
     var host = (req.headers && req.headers.host);
-    if (!res.headersSent) {
+
+    if (res.writeHead && !res.headersSent) {
         res.writeHead(500);
     }
+
     res.end('Error occured while trying to proxy to: '+ host + req.url);
 };