@@ -369,12 +369,16 @@ enum header_states
369369 , h_upgrade
370370
371371 , h_matching_transfer_encoding_chunked
372+ , h_matching_connection_token_start
372373 , h_matching_connection_keep_alive
373374 , h_matching_connection_close
375+ , h_matching_connection_upgrade
376+ , h_matching_connection_token
374377
375378 , h_transfer_encoding_chunked
376379 , h_connection_keep_alive
377380 , h_connection_close
381+ , h_connection_upgrade
378382 };
379383
380384enum http_host_state
@@ -406,6 +410,8 @@ enum http_host_state
406410 (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \
407411 (c) == '$' || (c) == ',')
408412
413+ #define STRICT_TOKEN (c ) (tokens[(unsigned char)c])
414+
409415#if HTTP_PARSER_STRICT
410416#define TOKEN (c ) (tokens[(unsigned char)c])
411417#define IS_URL_CHAR (c ) (BIT_AT(normal_url_char, (unsigned char)c))
@@ -1481,11 +1487,17 @@ size_t http_parser_execute (http_parser *parser,
14811487 /* looking for 'Connection: close' */
14821488 } else if (c == 'c' ) {
14831489 parser -> header_state = h_matching_connection_close ;
1490+ } else if (c == 'u' ) {
1491+ parser -> header_state = h_matching_connection_upgrade ;
14841492 } else {
1485- parser -> header_state = h_general ;
1493+ parser -> header_state = h_matching_connection_token ;
14861494 }
14871495 break ;
14881496
1497+ /* Multi-value `Connection` header */
1498+ case h_matching_connection_token_start :
1499+ break ;
1500+
14891501 default :
14901502 parser -> header_state = h_general ;
14911503 break ;
@@ -1585,12 +1597,28 @@ size_t http_parser_execute (http_parser *parser,
15851597 }
15861598 break ;
15871599
1600+ case h_matching_connection_token_start :
1601+ /* looking for 'Connection: keep-alive' */
1602+ if (c == 'k' ) {
1603+ h_state = h_matching_connection_keep_alive ;
1604+ /* looking for 'Connection: close' */
1605+ } else if (c == 'c' ) {
1606+ h_state = h_matching_connection_close ;
1607+ } else if (c == 'u' ) {
1608+ h_state = h_matching_connection_upgrade ;
1609+ } else if (STRICT_TOKEN (c )) {
1610+ h_state = h_matching_connection_token ;
1611+ } else {
1612+ h_state = h_general ;
1613+ }
1614+ break ;
1615+
15881616 /* looking for 'Connection: keep-alive' */
15891617 case h_matching_connection_keep_alive :
15901618 parser -> index ++ ;
15911619 if (parser -> index > sizeof (KEEP_ALIVE )- 1
15921620 || c != KEEP_ALIVE [parser -> index ]) {
1593- h_state = h_general ;
1621+ h_state = h_matching_connection_token ;
15941622 } else if (parser -> index == sizeof (KEEP_ALIVE )- 2 ) {
15951623 h_state = h_connection_keep_alive ;
15961624 }
@@ -1600,16 +1628,50 @@ size_t http_parser_execute (http_parser *parser,
16001628 case h_matching_connection_close :
16011629 parser -> index ++ ;
16021630 if (parser -> index > sizeof (CLOSE )- 1 || c != CLOSE [parser -> index ]) {
1603- h_state = h_general ;
1631+ h_state = h_matching_connection_token ;
16041632 } else if (parser -> index == sizeof (CLOSE )- 2 ) {
16051633 h_state = h_connection_close ;
16061634 }
16071635 break ;
16081636
1637+ /* looking for 'Connection: upgrade' */
1638+ case h_matching_connection_upgrade :
1639+ parser -> index ++ ;
1640+ if (parser -> index > sizeof (UPGRADE ) - 1 ||
1641+ c != UPGRADE [parser -> index ]) {
1642+ h_state = h_matching_connection_token ;
1643+ } else if (parser -> index == sizeof (UPGRADE )- 2 ) {
1644+ h_state = h_connection_upgrade ;
1645+ }
1646+ break ;
1647+
1648+ case h_matching_connection_token :
1649+ if (ch == ',' ) {
1650+ h_state = h_matching_connection_token_start ;
1651+ parser -> index = 0 ;
1652+ }
1653+ break ;
1654+
16091655 case h_transfer_encoding_chunked :
1656+ if (ch != ' ' ) h_state = h_general ;
1657+ break ;
1658+
16101659 case h_connection_keep_alive :
16111660 case h_connection_close :
1612- if (ch != ' ' ) h_state = h_general ;
1661+ case h_connection_upgrade :
1662+ if (ch == ',' ) {
1663+ if (h_state == h_connection_keep_alive ) {
1664+ parser -> flags |= F_CONNECTION_KEEP_ALIVE ;
1665+ } else if (h_state == h_connection_close ) {
1666+ parser -> flags |= F_CONNECTION_CLOSE ;
1667+ } else if (h_state == h_connection_upgrade ) {
1668+ parser -> flags |= F_CONNECTION_UPGRADE ;
1669+ }
1670+ h_state = h_matching_connection_token_start ;
1671+ parser -> index = 0 ;
1672+ } else if (ch != ' ' ) {
1673+ h_state = h_matching_connection_token ;
1674+ }
16131675 break ;
16141676
16151677 default :
@@ -1653,6 +1715,9 @@ size_t http_parser_execute (http_parser *parser,
16531715 case h_transfer_encoding_chunked :
16541716 parser -> flags |= F_CHUNKED ;
16551717 break ;
1718+ case h_connection_upgrade :
1719+ parser -> flags |= F_CONNECTION_UPGRADE ;
1720+ break ;
16561721 default :
16571722 break ;
16581723 }
@@ -1674,6 +1739,23 @@ size_t http_parser_execute (http_parser *parser,
16741739 UPDATE_STATE (s_header_value_discard_ws );
16751740 break ;
16761741 } else {
1742+ switch (parser -> header_state ) {
1743+ case h_connection_keep_alive :
1744+ parser -> flags |= F_CONNECTION_KEEP_ALIVE ;
1745+ break ;
1746+ case h_connection_close :
1747+ parser -> flags |= F_CONNECTION_CLOSE ;
1748+ break ;
1749+ case h_connection_upgrade :
1750+ parser -> flags |= F_CONNECTION_UPGRADE ;
1751+ break ;
1752+ case h_transfer_encoding_chunked :
1753+ parser -> flags |= F_CHUNKED ;
1754+ break ;
1755+ default :
1756+ break ;
1757+ }
1758+
16771759 /* header value was empty */
16781760 MARK (header_value );
16791761 UPDATE_STATE (s_header_field_start );
@@ -1697,7 +1779,9 @@ size_t http_parser_execute (http_parser *parser,
16971779
16981780 /* Set this here so that on_headers_complete() callbacks can see it */
16991781 parser -> upgrade =
1700- (parser -> flags & F_UPGRADE || parser -> method == HTTP_CONNECT );
1782+ ((parser -> flags & (F_UPGRADE | F_CONNECTION_UPGRADE )) ==
1783+ (F_UPGRADE | F_CONNECTION_UPGRADE ) ||
1784+ parser -> method == HTTP_CONNECT );
17011785
17021786 /* Here we call the headers_complete callback. This is somewhat
17031787 * different than other callbacks because if the user returns 1, we
0 commit comments