fix curl_multi with libevent2

[m6w6/ext-http] / php_http_message_parser.c

diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index 4162e3710cf060f027840bf92a16a4524de54803..fae3df3f46fc9021e5549bfd5ebfa8890984e2dd 100644 (file)
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -46,11 +46,11 @@ PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_me
 
 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 state;
        va_list va_args;
        unsigned i;
-       va_start(va_args, argc);
-       php_http_message_parser_state_t state;
 
+       va_start(va_args, argc);
        for (i = 0; i < argc; ++i) {
                state  = va_arg(va_args, php_http_message_parser_state_t);
                zend_stack_push(&parser->stack, &state, sizeof(state));
@@ -117,40 +117,34 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_strea
                        case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER:
                        case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE:
                                /* read line */
-                               php_stream_get_line(s, buf.data, buf.free, &len);
-                               buf.used += len;
-                               buf.free -= len;
+                               php_stream_get_line(s, buf.data + buf.used, buf.free, &len);
+                               php_http_buffer_account(&buf, len);
                                break;
 
                        case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB:
                                /* read all */
-                               len = php_stream_read(s, buf.data, buf.free);
-                               buf.used += len;
-                               buf.free -= len;
+                               php_http_buffer_account(&buf, php_stream_read(s, buf.data + buf.used, buf.free));
                                break;
 
                        case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH:
                                /* read body_length */
-                               len = php_stream_read(s, buf.data, MIN(buf.free, parser->body_length));
-                               buf.used += len;
-                               buf.free -= len;
+                               php_http_buffer_account(&buf, php_stream_read(s, buf.data + buf.used, MIN(buf.free, parser->body_length)));
                                break;
 
                        case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED:
                                /* duh, this is very naive */
                                if (len) {
-                                       size_t read = php_stream_read(s, buf.data, MIN(len, buf.free));
+                                       size_t read = php_stream_read(s, buf.data + buf.used, MIN(len, buf.free));
 
-                                       buf.used += read;
-                                       buf.free -= read;
+                                       php_http_buffer_account(&buf, read);
 
                                        len -= read;
                                } else {
+                                       php_http_buffer_resize(&buf, 24);
                                        php_stream_get_line(s, buf.data, buf.free, &len);
-                                       buf.used += len;
-                                       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;
 
@@ -176,10 +170,10 @@ 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)
 {
-       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
@@ -213,7 +207,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
                        {
                                unsigned header_parser_flags = (flags & PHP_HTTP_MESSAGE_PARSER_CLEANUP) ? PHP_HTTP_HEADER_PARSER_CLEANUP : 0;
 
-                               switch (php_http_header_parser_parse(&parser->header, buffer, header_parser_flags, &(*message)->hdrs, (php_http_info_callback_t) php_http_message_info_callback, message)) {
+                               switch (php_http_header_parser_parse(&parser->header, buffer, header_parser_flags, *message ? &(*message)->hdrs : NULL, (php_http_info_callback_t) php_http_message_info_callback, message)) {
                                        case PHP_HTTP_HEADER_PARSER_STATE_FAILURE:
                                                return PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE;
 
@@ -305,10 +299,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;
                                                }
                                        }
@@ -334,7 +334,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;
                                                                }
                                                        }
@@ -399,7 +399,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
                                len = buffer->used;
                                cut = len;
 
-                               php_http_message_parser_state_push(parser, 2, !buffer->used?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
+                               php_http_message_parser_state_push(parser, 2, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
                                break;
                        }