1 files changed, 6 insertions, 8 deletions
diff --git a/lib/_http_server.js b/lib/_http_server.js
index a133c2c153..cb949cb07e 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -433,8 +433,8 @@ function socketOnEnd(server, socket, parser, state) {
     state.outgoing[state.outgoing.length - 1]._last = true;
   } else if (socket._httpMessage) {
     socket._httpMessage._last = true;
-  } else {
-    if (socket.writable) socket.end();
+  } else if (socket.writable) {
+    socket.end();
   }
 }
 
@@ -602,13 +602,11 @@ function parserOnIncoming(server, socket, state, req, keepAlive) {
         res.writeContinue();
         server.emit('request', req, res);
       }
+    } else if (server.listenerCount('checkExpectation') > 0) {
+      server.emit('checkExpectation', req, res);
     } else {
-      if (server.listenerCount('checkExpectation') > 0) {
-        server.emit('checkExpectation', req, res);
-      } else {
-        res.writeHead(417);
-        res.end();
-      }
+      res.writeHead(417);
+      res.end();
     }
   } else {
     server.emit('request', req, res);