From: Michael Wallner <mike@php.net>
Date: Fri, 16 Jan 2015 16:09:29 +0000 (+0100)
Subject: use correct object handler to free the object
X-Git-Tag: RELEASE_3_0_0_RC1~101
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=d8beb35c8d7194ef1688cfd8dd6ed40ec8e31464

use correct object handler to free the object
---

diff --git a/php_http_client.c b/php_http_client.c
index 5da5e06..3ee3ff5 100644
--- a/php_http_client.c
+++ b/php_http_client.c
@@ -1164,7 +1164,7 @@ PHP_MINIT_FUNCTION(http_client)
 	zend_class_implements(php_http_client_class_entry, 2, spl_ce_SplSubject, spl_ce_Countable);
 	memcpy(&php_http_client_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_client_object_handlers.offset = XtOffsetOf(php_http_client_object_t, zo);
-	php_http_client_object_handlers.dtor_obj = php_http_client_object_free;
+	php_http_client_object_handlers.free_obj = php_http_client_object_free;
 	php_http_client_object_handlers.clone_obj = NULL;
 	zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE);
 	zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED);
diff --git a/php_http_cookie.c b/php_http_cookie.c
index a04de83..1a7e6a3 100644
--- a/php_http_cookie.c
+++ b/php_http_cookie.c
@@ -1021,7 +1021,7 @@ PHP_MINIT_FUNCTION(http_cookie)
 	memcpy(&php_http_cookie_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_cookie_object_handlers.offset = XtOffsetOf(php_http_cookie_object_t, zo);
 	php_http_cookie_object_handlers.clone_obj = php_http_cookie_object_clone;
-	php_http_cookie_object_handlers.dtor_obj = php_http_cookie_object_free;
+	php_http_cookie_object_handlers.free_obj = php_http_cookie_object_free;
 
 	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_COOKIE_PARSE_RAW TSRMLS_CC);
 	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("SECURE"), PHP_HTTP_COOKIE_SECURE TSRMLS_CC);
diff --git a/php_http_encoding.c b/php_http_encoding.c
index a6e9337..30b4c81 100644
--- a/php_http_encoding.c
+++ b/php_http_encoding.c
@@ -1179,7 +1179,7 @@ PHP_MINIT_FUNCTION(http_encoding)
 	php_http_encoding_stream_class_entry->create_object = php_http_encoding_stream_object_new;
 	memcpy(&php_http_encoding_stream_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_encoding_stream_object_handlers.clone_obj = php_http_encoding_stream_object_clone;
-	php_http_encoding_stream_object_handlers.dtor_obj = php_http_encoding_stream_object_free;
+	php_http_encoding_stream_object_handlers.free_obj = php_http_encoding_stream_object_free;
 
 	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_NONE"), PHP_HTTP_ENCODING_STREAM_FLUSH_NONE);
 	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_SYNC"), PHP_HTTP_ENCODING_STREAM_FLUSH_SYNC);
diff --git a/php_http_message.c b/php_http_message.c
index 8ba4802..5d4b3ed 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -1959,7 +1959,7 @@ PHP_MINIT_FUNCTION(http_message)
 	memcpy(&php_http_message_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_message_object_handlers.offset = XtOffsetOf(php_http_message_object_t, zo);
 	php_http_message_object_handlers.clone_obj = php_http_message_object_clone;
-	php_http_message_object_handlers.dtor_obj = php_http_message_object_free;
+	php_http_message_object_handlers.free_obj = php_http_message_object_free;
 	php_http_message_object_handlers.read_property = php_http_message_object_read_prop;
 	php_http_message_object_handlers.write_property = php_http_message_object_write_prop;
 	php_http_message_object_handlers.get_properties = php_http_message_object_get_props;
diff --git a/php_http_message_body.c b/php_http_message_body.c
index b5f03c2..3ecd895 100644
--- a/php_http_message_body.c
+++ b/php_http_message_body.c
@@ -883,7 +883,7 @@ PHP_MINIT_FUNCTION(http_message_body)
 	php_http_message_body_class_entry->create_object = php_http_message_body_object_new;
 	memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone;
-	php_http_message_body_object_handlers.dtor_obj = php_http_message_body_object_free;
+	php_http_message_body_object_handlers.free_obj = php_http_message_body_object_free;
 	zend_class_implements(php_http_message_body_class_entry, 1, zend_ce_serializable);
 
 	return SUCCESS;
diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index 64ab436..fb5b26f 100644
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -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);