HTTP info test & fixes

[m6w6/ext-http] / php_http_header_parser.c

diff --git a/php_http_header_parser.c b/php_http_header_parser.c
index 2ad902280897ee852982238bd435d7668289fe3b..0dbaf848f9e72f02d59f55f27e87ef7c4ba79eee 100644 (file)
--- a/php_http_header_parser.c
+++ b/php_http_header_parser.c
@@ -120,8 +120,8 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
                        }
 
                        case PHP_HTTP_HEADER_PARSER_STATE_KEY: {
-                               const char *colon, *eol_str;
-                               int eol_len;
+                               const char *colon, *eol_str = NULL;
+                               int eol_len = 0;
 
                                if (buffer->data == (eol_str = php_http_locate_bin_eol(buffer->data, buffer->used, &eol_len))) {
                                        /* end of headers */
@@ -152,14 +152,18 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
                                const char *eol_str;
                                int eol_len;
 
-                               do {
+                               line_split: {
+                                       
                                        if ((eol_str = php_http_locate_bin_eol(buffer->data, buffer->used, &eol_len))) {
                                                if (eol_str + eol_len - buffer->data < buffer->used) {
-                                                       char nextline = *(eol_str + eol_len);
-
-                                                       if (nextline == '\t' || nextline == ' ') {
-                                                               php_http_buffer_cut(buffer, eol_str - buffer->data, eol_len);
-                                                               continue;
+                                                       char *nextline = eol_str + eol_len;
+
+                                                       if (*nextline == '\t' || *nextline == ' ') {
+                                                               while (nextline < buffer->data + buffer->used && (*nextline == '\t' || *nextline == ' ')) {
+                                                                       ++nextline;
+                                                               }
+                                                               php_http_buffer_cut(buffer, eol_str - buffer->data, nextline - eol_str);
+                                                               goto line_split;
                                                        }
                                                }
 
@@ -175,7 +179,7 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
                                        } else {
                                                return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_VALUE);
                                        }
-                               } while (0);
+                               }
 
                                break;
                        }