X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_header_parser.c;h=2ad902280897ee852982238bd435d7668289fe3b;hp=69a419191b2f14558cd77053217ab17d48a0d1ac;hb=4d68865693332389b875e4466f8b5368c0876e15;hpb=df06e2dbf48a3b0d96f2c62071c1b5fc907a98d0 diff --git a/php_http_header_parser.c b/php_http_header_parser.c index 69a4191..2ad9022 100644 --- 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 | + +--------------------------------------------------------------------+ +*/ + +#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)); @@ -175,9 +186,9 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse 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); } @@ -197,3 +208,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 + */ +