Skip to content

Commit 8285f12

Browse files
ryry
committed
Upgrade http-parser
1 parent c6029c7 commit 8285f12

4 files changed

Lines changed: 124 additions & 17 deletions

File tree

‎deps/http_parser/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ like this for a request parser:
3939
settings.on_path = my_path_callback;
4040
settings.on_header_field = my_header_field_callback;
4141
/* ... */
42-
settings.data = my_socket;
4342

4443
http_parser *parser = malloc(sizeof(http_parser));
4544
http_parser_init(parser, HTTP_REQUEST);
45+
parser->data = my_socket;
4646

4747
When data is received on the socket execute the parser and check for errors.
4848

‎deps/http_parser/http_parser.c‎

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919
* IN THE SOFTWARE.
2020
*/
2121
#include <http_parser.h>
22-
#ifdef _WIN32
23-
typedef __int8 int8_t;
24-
typedef unsigned __int8 uint8_t;
25-
typedef __int16 int16_t;
26-
typedef unsigned __int16 uint16_t;
27-
typedef __int16 int32_t;
28-
typedef unsigned __int32 uint32_t;
29-
#else
30-
#include <stdint.h>
31-
#endif
3222
#include <assert.h>
3323
#include <stddef.h>
3424

@@ -143,6 +133,48 @@ static const char acceptable_header[256] = {
143133
'x', 'y', 'z', 0, 0, 0, 0, 0 };
144134

145135

136+
/* Tokens as defined by rfc 2616. Also lowercases them.
137+
* token = 1*<any CHAR except CTLs or separators>
138+
* separators = "(" | ")" | "<" | ">" | "@"
139+
* | "," | ";" | ":" | "\" | <">
140+
* | "/" | "[" | "]" | "?" | "="
141+
* | "{" | "}" | SP | HT
142+
*/
143+
static const char tokens[256] = {
144+
/* 0 nul 1 soh 2 stx 3 etx 4 eot 5 enq 6 ack 7 bel */
145+
0, 0, 0, 0, 0, 0, 0, 0,
146+
/* 8 bs 9 ht 10 nl 11 vt 12 np 13 cr 14 so 15 si */
147+
0, 0, 0, 0, 0, 0, 0, 0,
148+
/* 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb */
149+
0, 0, 0, 0, 0, 0, 0, 0,
150+
/* 24 can 25 em 26 sub 27 esc 28 fs 29 gs 30 rs 31 us */
151+
0, 0, 0, 0, 0, 0, 0, 0,
152+
/* 32 sp 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' */
153+
' ', '!', '"', '#', '$', '%', '&', '\'',
154+
/* 40 ( 41 ) 42 * 43 + 44 , 45 - 46 . 47 / */
155+
0, 0, '*', '+', 0, '-', '.', '/',
156+
/* 48 0 49 1 50 2 51 3 52 4 53 5 54 6 55 7 */
157+
'0', '1', '2', '3', '4', '5', '6', '7',
158+
/* 56 8 57 9 58 : 59 ; 60 < 61 = 62 > 63 ? */
159+
'8', '9', 0, 0, 0, 0, 0, 0,
160+
/* 64 @ 65 A 66 B 67 C 68 D 69 E 70 F 71 G */
161+
0, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
162+
/* 72 H 73 I 74 J 75 K 76 L 77 M 78 N 79 O */
163+
'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
164+
/* 80 P 81 Q 82 R 83 S 84 T 85 U 86 V 87 W */
165+
'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
166+
/* 88 X 89 Y 90 Z 91 [ 92 \ 93 ] 94 ^ 95 _ */
167+
'x', 'y', 'z', 0, 0, 0, '^', '_',
168+
/* 96 ` 97 a 98 b 99 c 100 d 101 e 102 f 103 g */
169+
'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
170+
/* 104 h 105 i 106 j 107 k 108 l 109 m 110 n 111 o */
171+
'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
172+
/* 112 p 113 q 114 r 115 s 116 t 117 u 118 v 119 w */
173+
'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
174+
/* 120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 del */
175+
'x', 'y', 'z', 0, '|', '}', '~', 0 };
176+
177+
146178
static const int8_t unhex[256] =
147179
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
148180
,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
@@ -302,6 +334,7 @@ enum flags
302334
#define CR '\r'
303335
#define LF '\n'
304336
#define LOWER(c) (unsigned char)(c | 0x20)
337+
#define TOKEN(c) tokens[(unsigned char)c]
305338

306339

307340
#define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res)
@@ -1006,9 +1039,9 @@ size_t http_parser_execute (http_parser *parser,
10061039
goto headers_almost_done;
10071040
}
10081041

1009-
c = LOWER(ch);
1042+
c = TOKEN(ch);
10101043

1011-
if (c < 'a' || 'z' < c) goto error;
1044+
if (!c) goto error;
10121045

10131046
MARK(header_field);
10141047

@@ -1041,7 +1074,7 @@ size_t http_parser_execute (http_parser *parser,
10411074

10421075
case s_header_field:
10431076
{
1044-
c = acceptable_header[(unsigned char)ch];
1077+
c = TOKEN(ch);
10451078

10461079
if (c) {
10471080
switch (header_state) {

‎deps/http_parser/http_parser.h‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,20 @@ extern "C" {
2626

2727

2828
#include <sys/types.h>
29-
#include <stdint.h>
30-
3129
#ifdef _WIN32
30+
typedef __int8 int8_t;
31+
typedef unsigned __int8 uint8_t;
32+
typedef __int16 int16_t;
33+
typedef unsigned __int16 uint16_t;
34+
typedef __int32 int32_t;
35+
typedef unsigned __int32 uint32_t;
36+
typedef __int64 int64_t;
37+
typedef unsigned __int64 uint64_t;
38+
3239
typedef unsigned int size_t;
3340
typedef int ssize_t;
41+
#else
42+
#include <stdint.h>
3443
#endif
3544

3645
/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run

‎deps/http_parser/test.c‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#undef FALSE
3232
#define FALSE 0
3333

34-
#define MAX_HEADERS 10
34+
#define MAX_HEADERS 13
3535
#define MAX_ELEMENT_SIZE 500
3636

3737
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -833,6 +833,71 @@ const struct message responses[] =
833833
,.body= "<xml>hello</xml>"
834834
}
835835

836+
837+
#define RES_FIELD_UNDERSCORE 10
838+
/* Should handle spaces in header fields */
839+
, {.name= "field underscore"
840+
,.type= HTTP_RESPONSE
841+
,.raw= "HTTP/1.1 200 OK\r\n"
842+
"Date: Tue, 28 Sep 2010 01:14:13 GMT\r\n"
843+
"Server: Apache\r\n"
844+
"Cache-Control: no-cache, must-revalidate\r\n"
845+
"Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
846+
"Set-Cookie: PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com\r\n"
847+
"Vary: Accept-Encoding\r\n"
848+
"_eep-Alive: timeout=45\r\n" /* semantic value ignored */
849+
"_onnection: Keep-Alive\r\n" /* semantic value ignored */
850+
"Transfer-Encoding: chunked\r\n"
851+
"Content-Type: text/html\r\n"
852+
"Connection: close\r\n"
853+
"\r\n"
854+
"0\r\n\r\n"
855+
,.should_keep_alive= FALSE
856+
,.message_complete_on_eof= FALSE
857+
,.http_major= 1
858+
,.http_minor= 1
859+
,.status_code= 200
860+
,.num_headers= 11
861+
,.headers=
862+
{ { "Date", "Tue, 28 Sep 2010 01:14:13 GMT" }
863+
, { "Server", "Apache" }
864+
, { "Cache-Control", "no-cache, must-revalidate" }
865+
, { "Expires", "Mon, 26 Jul 1997 05:00:00 GMT" }
866+
, { "Set-Cookie", "PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com" }
867+
, { "Vary", "Accept-Encoding" }
868+
, { "_eep-Alive", "timeout=45" }
869+
, { "_onnection", "Keep-Alive" }
870+
, { "Transfer-Encoding", "chunked" }
871+
, { "Content-Type", "text/html" }
872+
, { "Connection", "close" }
873+
}
874+
,.body= ""
875+
}
876+
877+
#define NON_ASCII_IN_STATUS_LINE 11
878+
/* Should handle non-ASCII in status line */
879+
, {.name= "non-ASCII in status line"
880+
,.type= HTTP_RESPONSE
881+
,.raw= "HTTP/1.1 500 Oriëntatieprobleem\r\n"
882+
"Date: Fri, 5 Nov 2010 23:07:12 GMT+2\r\n"
883+
"Content-Length: 0\r\n"
884+
"Connection: close\r\n"
885+
"\r\n"
886+
,.should_keep_alive= FALSE
887+
,.message_complete_on_eof= FALSE
888+
,.http_major= 1
889+
,.http_minor= 1
890+
,.status_code= 500
891+
,.num_headers= 3
892+
,.headers=
893+
{ { "Date", "Fri, 5 Nov 2010 23:07:12 GMT+2" }
894+
, { "Content-Length", "0" }
895+
, { "Connection", "close" }
896+
}
897+
,.body= ""
898+
}
899+
900+
836901
, {.name= NULL } /* sentinel */
837902
};
838903

0 commit comments

Comments
 (0)