haiwan
/
http-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use nginx-style method compare

Browse Source 
If only just to remove dependency on strncmp().
event_stream
Ryan Dahl 15 years ago
parent dbd2dad461
commit 4bce6b4467
1 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File

61
http_parser.c
Unescape View File

@ -236,6 +236,33 @@ enum flags
# define NEW_MESSAGE() start_state # define NEW_MESSAGE() start_state
#endif #endif
#define ngx_str3_cmp(m, c0, c1, c2) \
m[0] == c0 && m[1] == c1 && m[2] == c2
#define ngx_str3Ocmp(m, c0, c1, c2, c3) \
m[0] == c0 && m[2] == c2 && m[3] == c3
#define ngx_str4cmp(m, c0, c1, c2, c3) \
m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3
#define ngx_str5cmp(m, c0, c1, c2, c3, c4) \
m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 && m[4] == c4
#define ngx_str6cmp(m, c0, c1, c2, c3, c4, c5) \
m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 \
&& m[4] == c4 && m[5] == c5
#define ngx_str7_cmp(m, c0, c1, c2, c3, c4, c5, c6, c7) \
m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 \
&& m[4] == c4 && m[5] == c5 && m[6] == c6
#define ngx_str8cmp(m, c0, c1, c2, c3, c4, c5, c6, c7) \
m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 \
&& m[4] == c4 && m[5] == c5 && m[6] == c6 && m[7] == c7
#define ngx_str9cmp(m, c0, c1, c2, c3, c4, c5, c6, c7, c8) \
m[0] == c0 && m[1] == c1 && m[2] == c2 && m[3] == c3 \
&& m[4] == c4 && m[5] == c5 && m[6] == c6 && m[7] == c7 && m[8] == c8
size_t http_parser_execute (http_parser *parser, size_t http_parser_execute (http_parser *parser,
http_parser_settings settings, http_parser_settings settings,
const char *data, const char *data,
@ -450,16 +477,14 @@ size_t http_parser_execute (http_parser *parser,
assert(index+1 < HTTP_PARSER_MAX_METHOD_LEN); assert(index+1 < HTTP_PARSER_MAX_METHOD_LEN);
parser->buffer[index+1] = '\0'; parser->buffer[index+1] = '\0';
/* TODO Instead of using strncmp() use NGINX's ngx_str3Ocmp() */
switch (index+1) { switch (index+1) {
case 3: case 3:
if (strncmp(parser->buffer, "GET", 3) == 0) { if (ngx_str3_cmp(parser->buffer, 'G', 'E', 'T')) {
parser->method = HTTP_GET; parser->method = HTTP_GET;
break; break;
} }
if (strncmp(parser->buffer, "PUT", 3) == 0) { if (ngx_str3_cmp(parser->buffer, 'P', 'U', 'T')) {
parser->method = HTTP_PUT; parser->method = HTTP_PUT;
break; break;
} }
@ -467,22 +492,22 @@ size_t http_parser_execute (http_parser *parser,
break; break;
case 4: case 4:
if (strncmp(parser->buffer, "POST", 4) == 0) { if (ngx_str4cmp(parser->buffer, 'P', 'O', 'S', 'T')) {
parser->method = HTTP_POST; parser->method = HTTP_POST;
break; break;
} }
if (strncmp(parser->buffer, "HEAD", 4) == 0) { if (ngx_str4cmp(parser->buffer, 'H', 'E', 'A', 'D')) {
parser->method = HTTP_HEAD; parser->method = HTTP_HEAD;
break; break;
} }
if (strncmp(parser->buffer, "COPY", 4) == 0) { if (ngx_str4cmp(parser->buffer, 'C', 'O', 'P', 'Y')) {
parser->method = HTTP_COPY; parser->method = HTTP_COPY;
break; break;
} }
if (strncmp(parser->buffer, "MOVE", 4) == 0) { if (ngx_str4cmp(parser->buffer, 'M', 'O', 'V', 'E')) {
parser->method = HTTP_MOVE; parser->method = HTTP_MOVE;
break; break;
} }
@ -490,12 +515,12 @@ size_t http_parser_execute (http_parser *parser,
break; break;
case 5: case 5:
if (strncmp(parser->buffer, "MKCOL", 5) == 0) { if (ngx_str5cmp(parser->buffer, 'M', 'K', 'C', 'O', 'L')) {
parser->method = HTTP_MKCOL; parser->method = HTTP_MKCOL;
break; break;
} }
if (strncmp(parser->buffer, "TRACE", 5) == 0) { if (ngx_str5cmp(parser->buffer, 'T', 'R', 'A', 'C', 'E')) {
parser->method = HTTP_TRACE; parser->method = HTTP_TRACE;
break; break;
} }
@ -503,12 +528,12 @@ size_t http_parser_execute (http_parser *parser,
break; break;
case 6: case 6:
if (strncmp(parser->buffer, "DELETE", 6) == 0) { if (ngx_str6cmp(parser->buffer, 'D', 'E', 'L', 'E', 'T', 'E')) {
parser->method = HTTP_DELETE; parser->method = HTTP_DELETE;
break; break;
} }
if (strncmp(parser->buffer, "UNLOCK", 6) == 0) { if (ngx_str6cmp(parser->buffer, 'U', 'N', 'L', 'O', 'C', 'K')) {
parser->method = HTTP_UNLOCK; parser->method = HTTP_UNLOCK;
break; break;
} }
@ -516,12 +541,14 @@ size_t http_parser_execute (http_parser *parser,
break; break;
case 7: case 7:
if (strncmp(parser->buffer, "OPTIONS", 7) == 0) { if (ngx_str7_cmp(parser->buffer,
'O', 'P', 'T', 'I', 'O', 'N', 'S', '\0')) {
parser->method = HTTP_OPTIONS; parser->method = HTTP_OPTIONS;
break; break;
} }
if (strncmp(parser->buffer, "CONNECT", 7) == 0) { if (ngx_str7_cmp(parser->buffer,
'C', 'O', 'N', 'N', 'E', 'C', 'T', '\0')) {
parser->method = HTTP_CONNECT; parser->method = HTTP_CONNECT;
break; break;
} }
@ -529,7 +556,8 @@ size_t http_parser_execute (http_parser *parser,
break; break;
case 8: case 8:
if (strncmp(parser->buffer, "PROPFIND", 8) == 0) { if (ngx_str8cmp(parser->buffer,
'P', 'R', 'O', 'P', 'F', 'I', 'N', 'D')) {
parser->method = HTTP_PROPFIND; parser->method = HTTP_PROPFIND;
break; break;
} }
@ -537,7 +565,8 @@ size_t http_parser_execute (http_parser *parser,
break; break;
case 9: case 9:
if (strncmp(parser->buffer, "PROPPATCH", 9) == 0) { if (ngx_str9cmp(parser->buffer,
'P', 'R', 'O', 'P', 'P', 'A', 'T', 'C', 'H')) {
parser->method = HTTP_PROPPATCH; parser->method = HTTP_PROPPATCH;
break; break;
} }

Write Preview
Loading…
Cancel
Save