kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Updated http11_parser to Ragel 6.2

Browse source
This commit is contained in:
Luis Lavena 2009-07-07 01:25:24 -03:00
parent 502460077f
commit 9cb47f1a35
3 changed files with 244 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

1
History.txt
View file

@ -2,6 +2,7 @@
* Rake task project reorganization and reformat using Hoe. * Rake task project reorganization and reformat using Hoe.
* Compile extension using rake-compiler * Compile extension using rake-compiler
* Upgraded http11_parser to work with Ragel 6.2
=== 1.1.5 / 2008-05-22 === 1.1.5 / 2008-05-22

467
ext/http11/http11_parser.c
View file

File diff suppressed because it is too large Load diff

21
ext/http11/http11_parser.rl
View file

@ -23,12 +23,13 @@
action start_field { MARK(field_start, fpc); } action start_field { MARK(field_start, fpc); }
action snake_upcase_field { snake_upcase_char((char *)fpc); }
action write_field { action write_field {
parser->field_len = LEN(field_start, fpc); parser->field_len = LEN(field_start, fpc);
} }
action start_value { MARK(mark, fpc); } action start_value { MARK(mark, fpc); }
action write_value { action write_value {
if(parser->http_field != NULL) { if(parser->http_field != NULL) {
parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, fpc)); parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, fpc));
} }
@ -41,7 +42,7 @@
if(parser->request_uri != NULL) if(parser->request_uri != NULL)
parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc)); parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc));
} }
action fragment { action fragment {
if(parser->fragment != NULL) if(parser->fragment != NULL)
parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc)); parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc));
} }
@ -104,10 +105,10 @@ size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len,
assert(*pe == '\0' && "pointer does not end on NUL"); assert(*pe == '\0' && "pointer does not end on NUL");
assert(pe - p == len - off && "pointers aren't same distance"); assert(pe - p == len - off && "pointers aren't same distance");
%% write exec; %% write exec;
parser->cs = cs; if (!http_parser_has_error(parser))
parser->cs = cs;
parser->nread += p - (buffer + off); parser->nread += p - (buffer + off);
assert(p <= pe && "buffer overflow after parsing execute"); assert(p <= pe && "buffer overflow after parsing execute");
@ -117,23 +118,11 @@ size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len,
assert(parser->field_len <= len && "field has length longer than whole buffer"); assert(parser->field_len <= len && "field has length longer than whole buffer");
assert(parser->field_start < len && "field starts after buffer end"); assert(parser->field_start < len && "field starts after buffer end");
if(parser->body_start) {
/* final \r\n combo encountered so stop right here */
%%write eof;
parser->nread++;
}
return(parser->nread); return(parser->nread);
} }
int http_parser_finish(http_parser *parser) int http_parser_finish(http_parser *parser)
{ {
int cs = parser->cs;
%%write eof;
parser->cs = cs;
if (http_parser_has_error(parser) ) { if (http_parser_has_error(parser) ) {
return -1; return -1;
} else if (http_parser_is_finished(parser) ) { } else if (http_parser_is_finished(parser) ) {