add current state of refactoring

[m6w6/ext-http] / php_http_header_parser.c

diff --git a/php_http_header_parser.c b/php_http_header_parser.c
index 07bcab5f930019e54c49bd7eb42ad3d4e93c5e34..1dcd97b58800c4f7a7c40d8398d70774b9d23125 100644 (file)
--- a/php_http_header_parser.c
+++ b/php_http_header_parser.c
@@ -1,5 +1,16 @@
-
-#include "php_http.h"
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
+#include "php_http_api.h"
 
 typedef struct php_http_header_parser_state_spec {
        php_http_header_parser_state_t state;
@@ -15,7 +26,7 @@ static const php_http_header_parser_state_spec_t php_http_header_parser_states[]
 };
 
 
-PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_CC)
+PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC)
 {
        if (!parser) {
                parser = emalloc(sizeof(*parser));
@@ -89,9 +100,8 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
        while (buffer->used || !php_http_header_parser_states[php_http_header_parser_state_is(parser)].need_data) {
 #if 0
                const char *state[] = {"START", "KEY", "VALUE", "HEADER_DONE", "DONE"};
-               fprintf(stderr, "#HP-%p: %s (%d) %.*s…\n", parser,
-                               php_http_header_parser_state_is(parser)<0?"FAILURE":state[php_http_header_parser_state_is(parser)],
-                                               zend_hash_num_elements(headers), MIN(16,buffer->used), buffer->data);
+               fprintf(stderr, "#HP: %s (%d)\n", php_http_header_parser_state_is(parser) < 0 ? "FAILURE" : state[php_http_header_parser_state_is(parser)], zend_hash_num_elements(headers));
+               _dpf(0, buffer->data, buffer->used);
 #endif
                switch (php_http_header_parser_state_pop(parser)) {
                        case PHP_HTTP_HEADER_PARSER_STATE_FAILURE:
@@ -110,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 */
@@ -142,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;
+                                                       const 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;
                                                        }
                                                }
 
@@ -165,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;
                        }
@@ -174,11 +188,15 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
                                if (parser->_key.str && parser->_val.str) {
                                        zval array, **exist;
 
+                                       if (!headers && callback_func) {
+                                               callback_func(callback_arg, &headers, NULL TSRMLS_CC);
+                                       }
+
                                        INIT_PZVAL_ARRAY(&array, headers);
                                        php_http_pretty_key(parser->_key.str, parser->_key.len, 1, 1);
-                                       if (SUCCESS == zend_hash_find(headers, parser->_key.str, parser->_key.len + 1, (void *) &exist)) {
+                                       if (SUCCESS == zend_symtable_find(headers, parser->_key.str, parser->_key.len + 1, (void *) &exist)) {
                                                convert_to_array(*exist);
-                                               add_next_index_stringl(&array, parser->_val.str, parser->_val.len, 0);
+                                               add_next_index_stringl(*exist, parser->_val.str, parser->_val.len, 0);
                                        } else {
                                                add_assoc_stringl_ex(&array, parser->_key.str, parser->_key.len + 1, parser->_val.str, parser->_val.len, 0);
                                        }
@@ -198,3 +216,13 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
 
        return php_http_header_parser_state_is(parser);
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+