http: skip body and next message of CONNECT res

indutny · indutny · commit 9d4d529517e4 · 2016-04-19T11:48:06.000-04:00
When handling a response to `CONNECT` request - skip message body and do not attempt to parse the next message. `CONNECT` requests are used in similar sense to HTTP Upgrade. Fix: #6198 PR-URL: #6279 Reviewed-By: Brian White <mscdex@mscdex.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -432,7 +432,7 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
   // Responses to CONNECT request is handled as Upgrade.
   if (req.method === 'CONNECT') {
     res.upgrade = true;
-    return true; // skip body
+    return 2; // skip body, and the rest
   }
 
   // Responses to HEAD requests are crazy.
diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -96,7 +96,7 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method,
 
   parser.incoming.upgrade = upgrade;
 
-  var skipBody = false; // response to HEAD or CONNECT
+  var skipBody = 0; // response to HEAD or CONNECT
 
   if (!upgrade) {
     // For upgraded connections and CONNECT method request, we'll emit this
@@ -105,7 +105,10 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method,
     skipBody = parser.onIncoming(parser.incoming, shouldKeepAlive);
   }
 
-  return skipBody;
+  if (typeof skipBody !== 'number')
+    return skipBody ? 1 : 0;
+  else
+    return skipBody;
 }
 
 // XXX This is a mess.
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
@@ -300,7 +300,7 @@ class Parser : public AsyncWrap {
       return -1;
     }
 
-    return head_response->IsTrue() ? 1 : 0;
+    return head_response->IntegerValue();
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ function parserOnIncomingClient(res, shouldKeepAlive) {`
`432`	`432`	`// Responses to CONNECT request is handled as Upgrade.`
`433`	`433`	`if (req.method === 'CONNECT') {`
`434`	`434`	`res.upgrade = true;`
`435`		`- return true; // skip body`
	`435`	`+ return 2; // skip body, and the rest`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`// Responses to HEAD requests are crazy.`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ class Parser : public AsyncWrap {`
`300`	`300`	`return -1;`
`301`	`301`	`}`
`302`	`302`
`303`		`- return head_response->IsTrue() ? 1 : 0;`
	`303`	`+ return head_response->IntegerValue();`
`304`	`304`	`}`
`305`	`305`
`306`	`306`