X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=bf8eb508528c16b7439ccb8d7ca07760004e61d0;hp=8ba4802a6de50025b89072a0fc1c82d578c55aa4;hb=2fadfe473d799db68a5ab1ad421e0b206a1e51af;hpb=7096ff6dbb61fd13b9b04ef86bfbece8fb4b2ea0

diff --git a/php_http_message.c b/php_http_message.c
index 8ba4802..bf8eb50 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -20,7 +20,7 @@ zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable
 
 	/* advance message */
 	if (!old || old->type || zend_hash_num_elements(&old->hdrs)) {
-		(*message) = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
+		(*message) = php_http_message_init(NULL, 0, NULL);
 		(*message)->parent = old;
 		if (headers) {
 			(*headers) = &((*message)->hdrs);
@@ -500,7 +500,7 @@ static HashTable php_http_message_object_prophandlers;
 
 static void php_http_message_object_prophandler_hash_dtor(zval *pData)
 {
-	efree(Z_PTR_P(pData));
+	pefree(Z_PTR_P(pData), 1);
 }
 
 typedef void (*php_http_message_object_prophandler_func_t)(php_http_message_object_t *o, zval *v);
@@ -1017,7 +1017,7 @@ static PHP_METHOD(HttpMessage, __construct)
 		msg = php_http_message_parse(NULL, zs_msg->val, zs_msg->len, greedy);
 
 		if (!msg && !EG(exception)) {
-			php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, zs_msg->len), zs_msg->len);
+			php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, zs_msg->len), zs_msg->val);
 		}
 		zend_string_release(zs_msg);
 	}
@@ -1434,7 +1434,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpMessage, setResponseStatus)
 {
 	char *status;
-	int status_len;
+	size_t status_len;
 	php_http_message_object_t *obj;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len), invalid_arg, return);
@@ -1771,6 +1771,7 @@ static PHP_METHOD(HttpMessage, isMultipart)
 		}
 
 		if (zboundary && boundary) {
+			ZVAL_DEREF(zboundary);
 			zval_dtor(zboundary);
 			ZVAL_STR(zboundary, php_http_cs2zs(boundary, strlen(boundary)));
 		}
@@ -1959,7 +1960,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;