X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_header_parser.h;h=5b4993a459f070ed33fe27f2c40f8081f23c5e51;hb=b0c4cca568d6704c5d2aa3c3f0ec99f96fa3c44e;hp=78ca43ff70a654f9c669386be8ab2cbb64b70fcb;hpb=a458b9a25cf0ec9b4d8bde2b22e43c44d71427c8;p=m6w6%2Fext-http diff --git a/php_http_header_parser.h b/php_http_header_parser.h index 78ca43f..5b4993a 100644 --- a/php_http_header_parser.h +++ b/php_http_header_parser.h @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -20,6 +20,7 @@ typedef enum php_http_header_parser_state { PHP_HTTP_HEADER_PARSER_STATE_START = 0, PHP_HTTP_HEADER_PARSER_STATE_KEY, PHP_HTTP_HEADER_PARSER_STATE_VALUE, + PHP_HTTP_HEADER_PARSER_STATE_VALUE_EX, PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE, PHP_HTTP_HEADER_PARSER_STATE_DONE } php_http_header_parser_state_t; @@ -27,7 +28,7 @@ typedef enum php_http_header_parser_state { #define PHP_HTTP_HEADER_PARSER_CLEANUP 0x1 typedef struct php_http_header_parser { - zend_stack stack; + zend_ptr_stack stack; php_http_info_t info; struct { char *str; @@ -37,12 +38,9 @@ typedef struct php_http_header_parser { char *str; size_t len; } _val; -#ifdef ZTS - void ***ts; -#endif } php_http_header_parser_t; -PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC); +PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser); PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_push(php_http_header_parser_t *parser, unsigned argc, ...); PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser); PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_pop(php_http_header_parser_t *parser);