Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #81305: Built-in Webserver Drops Requests With "Upgrade" Header
This commit is contained in:
Christoph M. Becker 2021-07-29 13:18:43 +02:00
commit 3b461d93e1
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 43 additions and 0 deletions

View file

@ -1339,11 +1339,16 @@ size_t php_http_parser_execute (php_http_parser *parser,
}
}
/* We cannot meaningfully support upgrade requests, since we only
* support HTTP/1 for now.
*/
#if 0
/* Exit, the rest of the connect is in a different protocol. */
if (parser->upgrade) {
CALLBACK2(message_complete);
return (p - data);
}
#endif
if (parser->flags & F_SKIPBODY) {
CALLBACK2(message_complete);