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

Handling chunked messages

Browse Source
event_stream
Ryan Dahl 16 years ago
parent a0476a08a0
commit 0b8a48049c
3 changed files with 143 additions and 23 deletions
Show Stats Download Patch File Download Diff File

135
http_parser.c
Unescape View File

@ -6,8 +6,13 @@
# define NULL ((void*)0)
#endif
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#define MAX_FIELD_SIZE (80*1024)
#define MARK(FOR) \
do { \
parser->FOR##_mark = p; \
@ -98,6 +103,17 @@ static const unsigned char lowcase[] =
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
static int unhex[] =
{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1
,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
};
static const uint32_t usual[] = {
0xffffdbfe, /* 1111 1111 1111 1111 1101 1011 1111 1110 */
@ -175,7 +191,14 @@ enum state
, s_headers_almost_done
, s_headers_done
, s_body_chunked
, s_chunked_len_start
, s_chunked_len
, s_chunked_len_almost_done
, s_chunked_data
, s_chunked_data_almost_done
, s_chunked_data_done
, s_chunked_almost_done
, s_body_identity
, s_body_identity_eof
};
@ -204,6 +227,7 @@ enum header_states
enum flags
{ F_CHUNKED = 0x0001
, F_TRAILING= 0x0002
};
#define ERROR (p - data);
@ -218,10 +242,12 @@ size_t http_parser_execute (http_parser *parser, const char *data, size_t len)
enum state state = parser->state;
enum header_states header_state = parser->header_state;
size_t header_index = parser->header_index;
size_t to_read, header_index = parser->header_index;
if (len == 0 && state == s_body_identity_eof) {
if (len == 0) {
if (state == s_body_identity_eof) {
CALLBACK2(message_complete);
}
return 0;
}
@ -805,33 +831,45 @@ size_t http_parser_execute (http_parser *parser, const char *data, size_t len)
if (header_index > sizeof(CONNECTION)-1
|| c != CONNECTION[header_index]) {
header_state = h_general;
} else if (header_index == sizeof(CONNECTION)-1) {
} else if (header_index == sizeof(CONNECTION)-2) {
header_state = h_connection;
}
break;
case h_connection:
if (ch != ' ') header_state = h_general;
break;
/* content-length */
case h_matching_content_length:
if (header_index > sizeof(CONTENT_LENGTH)-1
|| c != CONTENT_LENGTH[header_index]) {
header_state = h_general;
} else if (header_index == sizeof(CONTENT_LENGTH)-1) {
} else if (header_index == sizeof(CONTENT_LENGTH)-2) {
header_state = h_content_length;
}
break;
case h_content_length:
if (ch != ' ') header_state = h_general;
break;
/* transfer-encoding */
case h_matching_transfer_encoding:
if (header_index > sizeof(TRANSFER_ENCODING)-1
|| c != TRANSFER_ENCODING[header_index]) {
header_state = h_general;
} else if (header_index == sizeof(TRANSFER_ENCODING)-1) {
} else if (header_index == sizeof(TRANSFER_ENCODING)-2) {
header_state = h_transfer_encoding;
}
break;
case h_transfer_encoding:
if (ch != ' ') header_state = h_general;
break;
default:
assert(0 && "Unknown header_state");
break;
@ -877,10 +915,11 @@ size_t http_parser_execute (http_parser *parser, const char *data, size_t len)
MARK(header_value);
state = s_header_value;
c = lowcase[(int)ch];
if (!c) {
state = s_header_value;
header_state = h_general;
} else {
switch (header_state) {
@ -911,11 +950,9 @@ size_t http_parser_execute (http_parser *parser, const char *data, size_t len)
break;
default:
state = s_header_value;
header_state = h_general;
break;
}
break;
}
break;
}
@ -1003,10 +1040,20 @@ size_t http_parser_execute (http_parser *parser, const char *data, size_t len)
case s_headers_almost_done:
if (ch != LF) return ERROR;
if (parser->flags & F_TRAILING) {
/* End of a chunked request */
CALLBACK2(message_complete);
state = s_start;
break;
}
CALLBACK2(headers_complete);
parser->body_read = 0;
if (parser->flags & F_CHUNKED) {
state = s_body_chunked;
state = s_chunked_len_start;
} else {
if (parser->content_length == 0) {
CALLBACK2(message_complete);
@ -1024,11 +1071,77 @@ size_t http_parser_execute (http_parser *parser, const char *data, size_t len)
break;
case s_body_identity:
to_read = MIN(pe - p, (ssize_t)(parser->content_length - parser->body_read));
if (to_read > 0) {
if (parser->on_body) parser->on_body(parser, p, to_read);
p += to_read - 1;
parser->body_read += to_read;
if (parser->body_read == parser->content_length) {
CALLBACK2(message_complete);
state = s_start;
}
}
break;
case s_chunked_len_start:
c = unhex[(int)ch];
if (c == -1) return ERROR;
parser->chunk_size = c;
state = s_chunked_len;
break;
case s_chunked_len:
if (ch == CR) {
state = s_chunked_len_almost_done;
break;
}
c = unhex[(int)ch];
if (c == -1) return ERROR;
parser->chunk_size *= 16;
parser->chunk_size += c;
break;
case s_chunked_len_almost_done:
if (ch != LF) return ERROR;
if (parser->chunk_size == 0) {
parser->flags |= F_TRAILING;
state = s_header_field_start;
} else {
state = s_chunked_data;
}
break;
case s_body_chunked:
case s_chunked_data:
to_read = MIN(pe - p, (ssize_t)(parser->chunk_size));
if (to_read > 0) {
if (parser->on_body) parser->on_body(parser, p, to_read);
p += to_read - 1;
}
if (to_read == parser->chunk_size) {
state = s_chunked_data_almost_done;
}
parser->chunk_size -= to_read;
break;
case s_chunked_data_almost_done:
if (ch != CR) return ERROR;
state = s_chunked_data_done;
break;
case s_chunked_data_done:
if (ch != LF) return ERROR;
state = s_chunked_len_start;
break;
case s_chunked_almost_done:
if (ch != LF) return ERROR;
default:
assert(0 && "unhandled state");
return ERROR;

2
http_parser.h
Unescape View File

@ -42,7 +42,7 @@ struct http_parser {
size_t chunk_size;
char flags;
size_t body_read;
ssize_t body_read;
const char *header_field_mark;
size_t header_field_size;

27
test.c
Unescape View File

@ -219,7 +219,7 @@ const struct message requests[] =
,.query_string= "q=search"
,.fragment= "hey"
,.request_path= "/post_identity_body_world"
,.request_uri= "/post_identity_body_world?q=search"
,.request_uri= "/post_identity_body_world?q=search#hey"
,.num_headers= 3
,.headers=
{ { "Accept", "*/*" }
@ -292,9 +292,11 @@ const struct message requests[] =
,.fragment= ""
,.request_path= "/chunked_w_trailing_headers"
,.request_uri= "/chunked_w_trailing_headers"
,.num_headers= 1
,.num_headers= 3
,.headers=
{ { "Transfer-Encoding", "chunked" }
, { "Vary", "*" }
, { "Content-Type", "text/plain" }
}
,.body= "hello world"
}
@ -717,13 +719,7 @@ print_error (const struct message *message, size_t error_location)
char_len = 2;
printf("\\n\n");
if (this_line) {
for (j = 0; j < error_location_line; j++) {
putchar(' ');
}
printf("^\n\nerror location: %d\n", error_location);
return;
}
if (this_line) goto print;
error_location_line = 0;
continue;
@ -735,6 +731,14 @@ print_error (const struct message *message, size_t error_location)
}
if (!this_line) error_location_line += char_len;
}
printf("[eof]\n");
print:
for (j = 0; j < error_location_line; j++) {
putchar(' ');
}
printf("^\n\nerror location: %d\n", error_location);
}
@ -757,7 +761,10 @@ test_message (const struct message *message)
exit(1);
}
assert(num_messages == 1);
if (num_messages != 1) {
printf("\n*** num_messages != 1 after testing '%s' ***\n\n", message->name);
exit(1);
}
message_eq(0, message);
}

Write Preview
Loading…
Cancel
Save