X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_parser.c;h=b64eb0035853c79c8048e22c3a38fba5b976fe72;hp=5acf66f76529f18d20cce5fdcd40f6a9465fe8b0;hb=47be714b40e14b6b5cdc2f35a7994efd13c2076e;hpb=3aee7891076f2ced989ab589df41c4a1a070670d diff --git a/php_http_message_parser.c b/php_http_message_parser.c index 5acf66f..b64eb00 100644 --- a/php_http_message_parser.c +++ b/php_http_message_parser.c @@ -6,12 +6,16 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2013, Michael Wallner | +--------------------------------------------------------------------+ */ #include "php_http_api.h" +#ifndef DBG_PARSER +# define DBG_PARSER 0 +#endif + typedef struct php_http_message_parser_state_spec { php_http_message_parser_state_t state; unsigned need_data:1; @@ -29,7 +33,18 @@ static const php_http_message_parser_state_spec_t php_http_message_parser_states {PHP_HTTP_MESSAGE_PARSER_STATE_DONE, 0} }; -PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC) +#if DBG_PARSER +const char *php_http_message_parser_state_name(php_http_message_parser_state_t state) { + const char *states[] = {"START", "HEADER", "HEADER_DONE", "BODY", "BODY_DUMB", "BODY_LENGTH", "BODY_CHUNK", "BODY_DONE", "DONE"}; + + if (state < 0 || state > (sizeof(states)/sizeof(char*))-1) { + return "FAILURE"; + } + return states[state]; +} +#endif + +php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC) { if (!parser) { parser = emalloc(sizeof(*parser)); @@ -44,7 +59,7 @@ PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_me return parser; } -PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_push(php_http_message_parser_t *parser, unsigned argc, ...) +php_http_message_parser_state_t php_http_message_parser_state_push(php_http_message_parser_t *parser, unsigned argc, ...) { php_http_message_parser_state_t state; va_list va_args; @@ -60,7 +75,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_push( return state; } -PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_is(php_http_message_parser_t *parser) +php_http_message_parser_state_t php_http_message_parser_state_is(php_http_message_parser_t *parser) { php_http_message_parser_state_t *state; @@ -70,7 +85,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_is(ph return PHP_HTTP_MESSAGE_PARSER_STATE_START; } -PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_pop(php_http_message_parser_t *parser) +php_http_message_parser_state_t php_http_message_parser_state_pop(php_http_message_parser_t *parser) { php_http_message_parser_state_t state, *state_ptr; if (SUCCESS == zend_stack_top(&parser->stack, (void *) &state_ptr)) { @@ -81,7 +96,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_pop(p return PHP_HTTP_MESSAGE_PARSER_STATE_START; } -PHP_HTTP_API void php_http_message_parser_dtor(php_http_message_parser_t *parser) +void php_http_message_parser_dtor(php_http_message_parser_t *parser) { php_http_header_parser_dtor(&parser->header); zend_stack_destroy(&parser->stack); @@ -93,7 +108,7 @@ PHP_HTTP_API void php_http_message_parser_dtor(php_http_message_parser_t *parser } } -PHP_HTTP_API void php_http_message_parser_free(php_http_message_parser_t **parser) +void php_http_message_parser_free(php_http_message_parser_t **parser) { if (*parser) { php_http_message_parser_dtor(*parser); @@ -102,17 +117,20 @@ PHP_HTTP_API void php_http_message_parser_free(php_http_message_parser_t **parse } } -PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_stream(php_http_message_parser_t *parser, php_stream *s, php_http_message_t **message) +php_http_message_parser_state_t php_http_message_parser_parse_stream(php_http_message_parser_t *parser, php_stream *s, unsigned flags, php_http_message_t **message) { php_http_buffer_t buf; + php_http_message_parser_state_t state = PHP_HTTP_MESSAGE_PARSER_STATE_START; TSRMLS_FETCH_FROM_CTX(parser->ts); php_http_buffer_init_ex(&buf, 0x1000, PHP_HTTP_BUFFER_INIT_PREALLOC); while (!php_stream_eof(s)) { size_t len = 0; - - switch (php_http_message_parser_state_is(parser)) { +#if DBG_PARSER + fprintf(stderr, "#SP: %s (f:%u)\n", php_http_message_parser_state_name(state), flags); +#endif + switch (state) { case PHP_HTTP_MESSAGE_PARSER_STATE_START: case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER: case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE: @@ -140,10 +158,11 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_strea len -= read; } else { + php_http_buffer_resize(&buf, 24); php_stream_get_line(s, buf.data, buf.free, &len); php_http_buffer_account(&buf, len); - len = strtoul(buf.data - len, NULL, 16); + len = strtoul(buf.data + buf.used - len, NULL, 16); } break; @@ -159,7 +178,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_strea return php_http_message_parser_state_is(parser); } - php_http_message_parser_parse(parser, &buf, 0, message); + state = php_http_message_parser_parse(parser, &buf, flags, message); } php_http_buffer_dtor(&buf); @@ -167,17 +186,21 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_strea } -PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, php_http_message_t **message) +php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, php_http_message_t **message) { - TSRMLS_FETCH_FROM_CTX(parser->ts); char *str = NULL; size_t len = 0; size_t cut = 0; + TSRMLS_FETCH_FROM_CTX(parser->ts); while (buffer->used || !php_http_message_parser_states[php_http_message_parser_state_is(parser)].need_data) { -#if 0 - const char *state[] = {"START", "HEADER", "HEADER_DONE", "BODY", "BODY_DUMB", "BODY_LENGTH", "BODY_CHUNK", "BODY_DONE", "DONE"}; - fprintf(stderr, "#MP: %s (%d)\n", php_http_message_parser_state_is(parser) < 0 ? "FAILURE" : state[php_http_message_parser_state_is(parser)], message && *message ? (*message)->type : -1); +#if DBG_PARSER + fprintf(stderr, "#MP: %s (f: %u, t:%d, l:%zu)\n", + php_http_message_parser_state_name(php_http_message_parser_state_is(parser)), + flags, + message && *message ? (*message)->type : -1, + buffer->used + ); _dpf(0, buffer->data, buffer->used); #endif @@ -298,10 +321,16 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h if (h_cl) { char *stop; - parser->body_length = strtoul(Z_STRVAL_PP(h_cl), &stop, 10); + if (Z_TYPE_PP(h_cl) == IS_STRING) { + parser->body_length = strtoul(Z_STRVAL_PP(h_cl), &stop, 10); - if (stop != Z_STRVAL_PP(h_cl)) { - php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); + if (stop != Z_STRVAL_PP(h_cl)) { + php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); + break; + } + } else if (Z_TYPE_PP(h_cl) == IS_LONG) { + parser->body_length = Z_LVAL_PP(h_cl); + php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); break; } } @@ -327,7 +356,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h if (end >= start && (!total || end < total)) { parser->body_length = end + 1 - start; - php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); + php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); break; } } @@ -364,11 +393,11 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h len = dec_len; } - php_stream_write(php_http_message_body_stream(&(*message)->body), str, len); + php_stream_write(php_http_message_body_stream((*message)->body), str, len); /* keep track */ MAKE_STD_ZVAL(zcl); - ZVAL_LONG(zcl, php_http_message_body_size(&(*message)->body)); + ZVAL_LONG(zcl, php_http_message_body_size((*message)->body)); zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), &zcl, sizeof(zval *), NULL); } @@ -422,14 +451,14 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h size_t dec_len; if (SUCCESS != php_http_encoding_stream_update(parser->dechunk, buffer->data, buffer->used, &dec_str, &dec_len)) { - return FAILURE; + return PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE; } str = dec_str; len = dec_len; if (php_http_encoding_stream_done(parser->dechunk)) { - cut = buffer->used - PHP_HTTP_BUFFER_LEN(parser->dechunk->ctx); + cut = buffer->used - PHP_HTTP_BUFFER(parser->dechunk->ctx)->used; php_http_message_parser_state_push(parser, 2, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE, PHP_HTTP_MESSAGE_PARSER_STATE_BODY); } else { cut = buffer->used; @@ -470,6 +499,10 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h } php_http_buffer_cut(buffer, 0, ptr - buffer->data); + + if (!(flags & PHP_HTTP_MESSAGE_PARSER_GREEDY)) { + return PHP_HTTP_MESSAGE_PARSER_STATE_DONE; + } break; } }