X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_message_parser.c;h=fb5b26fde910562aef7da6fa1ebe5abb5de020da;hb=d8beb35c8d7194ef1688cfd8dd6ed40ec8e31464;hp=ba43f08f74f9b9b0d8efda5e333098243a4d6f9d;hpb=03f11ce599fa5a89148d588caf6ccec7f939e9d4;p=m6w6%2Fext-http

diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index ba43f08..fb5b26f 100644
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -249,14 +249,14 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 			{
 				zval h, *h_loc = NULL, *h_con = NULL, *h_cl, *h_cr, *h_te, *h_ce;
 
-				if ((h_te = php_http_message_header(*message, ZEND_STRL("Transfer-Encoding"), 1))) {
+				if ((h_te = php_http_message_header(*message, ZEND_STRL("Transfer-Encoding")))) {
 					zend_hash_str_update(&(*message)->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), h_te);
 					zend_hash_str_del(&(*message)->hdrs, "Transfer-Encoding", lenof("Transfer-Encoding"));
 				}
-				if ((h_cl = php_http_message_header(*message, ZEND_STRL("Content-Length"), 1))) {
+				if ((h_cl = php_http_message_header(*message, ZEND_STRL("Content-Length")))) {
 					zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"), h_cl);
 				}
-				if ((h_cr = php_http_message_header(*message, ZEND_STRL("Content-Range"), 1))) {
+				if ((h_cr = php_http_message_header(*message, ZEND_STRL("Content-Range")))) {
 					zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Range", sizeof("X-Original-Content-Range"), h_cr);
 					zend_hash_str_del(&(*message)->hdrs, "Content-Range", lenof("Content-Range"));
 				}
@@ -271,8 +271,8 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 				if ((flags & PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS)
 				&&	(*message)->type == PHP_HTTP_RESPONSE
 				&&	(*message)->http.info.response.code/100 == 3
-				&&	(h_loc = php_http_message_header(*message, ZEND_STRL("Location"), 1))
-				&&	(h_con = php_http_message_header(*message, ZEND_STRL("Connection"), 1))
+				&&	(h_loc = php_http_message_header(*message, ZEND_STRL("Location")))
+				&&	(h_con = php_http_message_header(*message, ZEND_STRL("Connection")))
 				) {
 					if (php_http_match(Z_STRVAL_P(h_con), "close", PHP_HTTP_MATCH_WORD)) {
 						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_DONE);
@@ -288,7 +288,7 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 					zval_ptr_dtor(h_con);
 				}
 
-				if ((h_ce = php_http_message_header(*message, ZEND_STRL("Content-Encoding"), 1))) {
+				if ((h_ce = php_http_message_header(*message, ZEND_STRL("Content-Encoding")))) {
 					if (php_http_match(Z_STRVAL_P(h_ce), "gzip", PHP_HTTP_MATCH_WORD)
 					||	php_http_match(Z_STRVAL_P(h_ce), "x-gzip", PHP_HTTP_MATCH_WORD)
 					||	php_http_match(Z_STRVAL_P(h_ce), "deflate", PHP_HTTP_MATCH_WORD)
@@ -630,7 +630,7 @@ PHP_MINIT_FUNCTION(http_message_parser)
 	memcpy(&php_http_message_parser_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_message_parser_class_entry->create_object = php_http_message_parser_object_new;
 	php_http_message_parser_object_handlers.clone_obj = NULL;
-	php_http_message_parser_object_handlers.dtor_obj = php_http_message_parser_object_free;
+	php_http_message_parser_object_handlers.free_obj = php_http_message_parser_object_free;
 	php_http_message_parser_object_handlers.offset = XtOffsetOf(php_http_message_parser_object_t, zo);
 
 	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_MESSAGE_PARSER_CLEANUP);