From d23643051e0f351a0c61b0de8c7769ee89cb8160 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 10 Nov 2010 22:12:47 -0800 Subject: [PATCH] Upgrade http-parser again --- deps/http_parser/http_parser.c | 96 ++++++++++++---------------------- deps/http_parser/http_parser.h | 2 +- deps/http_parser/test.c | 35 ++++++++++--- 3 files changed, 61 insertions(+), 72 deletions(-) diff --git a/deps/http_parser/http_parser.c b/deps/http_parser/http_parser.c index 6a6e4e9ca2..492ef171fe 100644 --- a/deps/http_parser/http_parser.c +++ b/deps/http_parser/http_parser.c @@ -96,43 +96,6 @@ static const char *method_strings[] = }; -/* ' ', '_', '-' and all alpha-numeric ascii characters are accepted by acceptable_header. - The 'A'-'Z' are lower-cased. */ -static const char acceptable_header[256] = { -/* 0 nul 1 soh 2 stx 3 etx 4 eot 5 enq 6 ack 7 bel */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 8 bs 9 ht 10 nl 11 vt 12 np 13 cr 14 so 15 si */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 24 can 25 em 26 sub 27 esc 28 fs 29 gs 30 rs 31 us */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 32 sp 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' */ - ' ', 0, 0, 0, 0, 0, 0, 0, -/* 40 ( 41 ) 42 * 43 + 44 , 45 - 46 . 47 / */ - 0, 0, 0, 0, 0, '-', 0, 0, -/* 48 0 49 1 50 2 51 3 52 4 53 5 54 6 55 7 */ - '0', '1', '2', '3', '4', '5', '6', '7', -/* 56 8 57 9 58 : 59 ; 60 < 61 = 62 > 63 ? */ - '8', '9', 0, 0, 0, 0, 0, 0, -/* 64 @ 65 A 66 B 67 C 68 D 69 E 70 F 71 G */ - 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', -/* 72 H 73 I 74 J 75 K 76 L 77 M 78 N 79 O */ - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', -/* 80 P 81 Q 82 R 83 S 84 T 85 U 86 V 87 W */ - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', -/* 88 X 89 Y 90 Z 91 [ 92 \ 93 ] 94 ^ 95 _ */ - 'x', 'y', 'z', 0, 0, 0, 0, '_', -/* 96 ` 97 a 98 b 99 c 100 d 101 e 102 f 103 g */ - 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', -/* 104 h 105 i 106 j 107 k 108 l 109 m 110 n 111 o */ - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', -/* 112 p 113 q 114 r 115 s 116 t 117 u 118 v 119 w */ - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', -/* 120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 del */ - 'x', 'y', 'z', 0, 0, 0, 0, 0 }; - - /* Tokens as defined by rfc 2616. Also lowercases them. * token = 1* * separators = "(" | ")" | "<" | ">" | "@" @@ -695,6 +658,9 @@ size_t http_parser_execute (http_parser *parser, } else if (ch == '.') { state = s_req_host; break; + } else if ('0' <= ch && ch <= '9') { + state = s_req_host; + break; } goto error; @@ -772,12 +738,14 @@ size_t http_parser_execute (http_parser *parser, case CR: CALLBACK(url); CALLBACK(path); + parser->http_major = 0; parser->http_minor = 9; state = s_req_line_almost_done; break; case LF: CALLBACK(url); CALLBACK(path); + parser->http_major = 0; parser->http_minor = 9; state = s_header_field_start; break; @@ -812,11 +780,13 @@ size_t http_parser_execute (http_parser *parser, break; case CR: CALLBACK(url); + parser->http_major = 0; parser->http_minor = 9; state = s_req_line_almost_done; break; case LF: CALLBACK(url); + parser->http_major = 0; parser->http_minor = 9; state = s_header_field_start; break; @@ -845,12 +815,14 @@ size_t http_parser_execute (http_parser *parser, case CR: CALLBACK(url); CALLBACK(query_string); + parser->http_major = 0; parser->http_minor = 9; state = s_req_line_almost_done; break; case LF: CALLBACK(url); CALLBACK(query_string); + parser->http_major = 0; parser->http_minor = 9; state = s_header_field_start; break; @@ -879,11 +851,13 @@ size_t http_parser_execute (http_parser *parser, break; case CR: CALLBACK(url); + parser->http_major = 0; parser->http_minor = 9; state = s_req_line_almost_done; break; case LF: CALLBACK(url); + parser->http_major = 0; parser->http_minor = 9; state = s_header_field_start; break; @@ -912,12 +886,14 @@ size_t http_parser_execute (http_parser *parser, case CR: CALLBACK(url); CALLBACK(fragment); + parser->http_major = 0; parser->http_minor = 9; state = s_req_line_almost_done; break; case LF: CALLBACK(url); CALLBACK(fragment); + parser->http_major = 0; parser->http_minor = 9; state = s_header_field_start; break; @@ -1210,23 +1186,18 @@ size_t http_parser_execute (http_parser *parser, state = s_header_value; index = 0; - c = acceptable_header[(unsigned char)ch]; - - if (!c) { - if (ch == CR) { - CALLBACK(header_value); - header_state = h_general; - state = s_header_almost_done; - break; - } - - if (ch == LF) { - CALLBACK(header_value); - state = s_header_field_start; - break; - } + c = LOWER(ch); + if (ch == CR) { + CALLBACK(header_value); header_state = h_general; + state = s_header_almost_done; + break; + } + + if (ch == LF) { + CALLBACK(header_value); + state = s_header_field_start; break; } @@ -1271,22 +1242,19 @@ size_t http_parser_execute (http_parser *parser, case s_header_value: { - c = acceptable_header[(unsigned char)ch]; + c = LOWER(ch); - if (!c) { - if (ch == CR) { - CALLBACK(header_value); - state = s_header_almost_done; - break; - } - - if (ch == LF) { - CALLBACK(header_value); - goto header_almost_done; - } + if (ch == CR) { + CALLBACK(header_value); + state = s_header_almost_done; break; } + if (ch == LF) { + CALLBACK(header_value); + goto header_almost_done; + } + switch (header_state) { case h_general: break; diff --git a/deps/http_parser/http_parser.h b/deps/http_parser/http_parser.h index d46f4426bc..ca7f562094 100644 --- a/deps/http_parser/http_parser.h +++ b/deps/http_parser/http_parser.h @@ -26,7 +26,7 @@ extern "C" { #include -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__MINGW32__) typedef __int8 int8_t; typedef unsigned __int8 uint8_t; typedef __int16 int16_t; diff --git a/deps/http_parser/test.c b/deps/http_parser/test.c index c6f94fd983..d1feae0a8b 100644 --- a/deps/http_parser/test.c +++ b/deps/http_parser/test.c @@ -498,7 +498,7 @@ const struct message requests[] = #define CONNECT_REQUEST 17 , {.name = "connect request" ,.type= HTTP_REQUEST - ,.raw= "CONNECT home.netscape.com:443 HTTP/1.0\r\n" + ,.raw= "CONNECT home0.netscape.com:443 HTTP/1.0\r\n" "User-agent: Mozilla/1.1N\r\n" "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n" "\r\n" @@ -510,7 +510,7 @@ const struct message requests[] = ,.query_string= "" ,.fragment= "" ,.request_path= "" - ,.request_url= "home.netscape.com:443" + ,.request_url= "home0.netscape.com:443" ,.num_headers= 2 ,.upgrade=1 ,.headers= { { "User-agent", "Mozilla/1.1N" } @@ -538,6 +538,25 @@ const struct message requests[] = ,.body= "" } +#define NO_HTTP_VERSION 19 +, {.name= "request with no http version" + ,.type= HTTP_REQUEST + ,.raw= "GET /\r\n" + "\r\n" + ,.should_keep_alive= FALSE + ,.message_complete_on_eof= FALSE + ,.http_major= 0 + ,.http_minor= 9 + ,.method= HTTP_GET + ,.query_string= "" + ,.fragment= "" + ,.request_path= "/" + ,.request_url= "/" + ,.num_headers= 0 + ,.headers= {} + ,.body= "" + } + , {.name= NULL } /* sentinel */ }; @@ -551,9 +570,10 @@ const struct message responses[] = "Content-Type: text/html; charset=UTF-8\r\n" "Date: Sun, 26 Apr 2009 11:11:49 GMT\r\n" "Expires: Tue, 26 May 2009 11:11:49 GMT\r\n" + "X-$PrototypeBI-Version: 1.6.0.3\r\n" /* $ char in header field */ "Cache-Control: public, max-age=2592000\r\n" "Server: gws\r\n" - "Content-Length: 219\r\n" + "Content-Length: 219 \r\n" "\r\n" "\n" "301 Moved\n" @@ -566,15 +586,16 @@ const struct message responses[] = ,.http_major= 1 ,.http_minor= 1 ,.status_code= 301 - ,.num_headers= 7 + ,.num_headers= 8 ,.headers= { { "Location", "http://www.google.com/" } , { "Content-Type", "text/html; charset=UTF-8" } , { "Date", "Sun, 26 Apr 2009 11:11:49 GMT" } , { "Expires", "Tue, 26 May 2009 11:11:49 GMT" } + , { "X-$PrototypeBI-Version", "1.6.0.3" } , { "Cache-Control", "public, max-age=2592000" } , { "Server", "gws" } - , { "Content-Length", "219" } + , { "Content-Length", "219 " } } ,.body= "\n" "301 Moved\n" @@ -843,7 +864,7 @@ const struct message responses[] = "Server: Apache\r\n" "Cache-Control: no-cache, must-revalidate\r\n" "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n" - "Set-Cookie: PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com\r\n" + ".et-Cookie: PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com\r\n" "Vary: Accept-Encoding\r\n" "_eep-Alive: timeout=45\r\n" /* semantic value ignored */ "_onnection: Keep-Alive\r\n" /* semantic value ignored */ @@ -863,7 +884,7 @@ const struct message responses[] = , { "Server", "Apache" } , { "Cache-Control", "no-cache, must-revalidate" } , { "Expires", "Mon, 26 Jul 1997 05:00:00 GMT" } - , { "Set-Cookie", "PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com" } + , { ".et-Cookie", "PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com" } , { "Vary", "Accept-Encoding" } , { "_eep-Alive", "timeout=45" } , { "_onnection", "Keep-Alive" }