back to dev

[m6w6/ext-http] / php_http_header_parser.c

diff --git a/php_http_header_parser.c b/php_http_header_parser.c
index f560a8561a5917f241500b1c53a647f28e60a66e..df0837df2727430de080869760daa65f4f7b8969 100644 (file)
--- a/php_http_header_parser.c
+++ b/php_http_header_parser.c
@@ -59,10 +59,8 @@ php_http_header_parser_state_t php_http_header_parser_state_push(php_http_header
 
 php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser)
 {
-       php_http_header_parser_state_t state;
-
        if (parser->stack.top) {
-               return (php_http_header_parser_state_t) zend_ptr_stack_top(&parser->stack);
+               return (php_http_header_parser_state_t) parser->stack.elements[parser->stack.top - 1];
        }
 
        return PHP_HTTP_HEADER_PARSER_STATE_START;
@@ -81,8 +79,8 @@ void php_http_header_parser_dtor(php_http_header_parser_t *parser)
 {
        zend_ptr_stack_destroy(&parser->stack);
        php_http_info_dtor(&parser->info);
-       STR_FREE(parser->_key.str);
-       STR_FREE(parser->_val.str);
+       PTR_FREE(parser->_key.str);
+       PTR_FREE(parser->_val.str);
 }
 
 void php_http_header_parser_free(php_http_header_parser_t **parser)
@@ -233,8 +231,8 @@ STATUS php_http_header_parser_parse(php_http_header_parser_t *parser, php_http_b
                                        parser->_val.str = NULL;
                                }
 
-                               STR_SET(parser->_key.str, NULL);
-                               STR_SET(parser->_val.str, NULL);
+                               PTR_SET(parser->_key.str, NULL);
+                               PTR_SET(parser->_val.str, NULL);
 
                                php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_KEY);
                                break;