Commit 07fd52e
http: skip body and next message of CONNECT res
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>1 parent e06ab64 commit 07fd52e
3 files changed
Lines changed: 7 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -393,7 +393,7 @@ function parserOnIncomingClient(res, shouldKeepAlive) { | |||
| 393 | 393 | // Responses to CONNECT request is handled as Upgrade. | |
| 394 | 394 | if (req.method === 'CONNECT') { | |
| 395 | 395 | res.upgrade = true; | |
| 396 | - return true; // skip body | ||
| 396 | + return 2; // skip body, and the rest | ||
| 397 | 397 | } | |
| 398 | 398 | ||
| 399 | 399 | // Responses to HEAD requests are crazy. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -94,7 +94,7 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method, | |||
| 94 | 94 | ||
| 95 | 95 | parser.incoming.upgrade = upgrade; | |
| 96 | 96 | ||
| 97 | - var skipBody = false; // response to HEAD or CONNECT | ||
| 97 | + var skipBody = 0; // response to HEAD or CONNECT | ||
| 98 | 98 | ||
| 99 | 99 | if (!upgrade) { | |
| 100 | 100 | // For upgraded connections and CONNECT method request, we'll emit this | |
@@ -103,7 +103,10 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method, | |||
| 103 | 103 | skipBody = parser.onIncoming(parser.incoming, shouldKeepAlive); | |
| 104 | 104 | } | |
| 105 | 105 | ||
| 106 | - return skipBody; | ||
| 106 | + if (typeof skipBody !== 'number') | ||
| 107 | + return skipBody ? 1 : 0; | ||
| 108 | + else | ||
| 109 | + return skipBody; | ||
| 107 | 110 | } | |
| 108 | 111 | ||
| 109 | 112 | // XXX This is a mess. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -301,7 +301,7 @@ class Parser : public AsyncWrap { | |||
| 301 | 301 | return -1; | |
| 302 | 302 | } | |
| 303 | 303 | ||
| 304 | - return head_response->IsTrue() ? 1 : 0; | ||
| 304 | + return head_response->IntegerValue(); | ||
| 305 | 305 | } | |
| 306 | 306 | ||
| 307 | 307 | ||
0 commit comments