X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message.c;h=371ecb7067d021785caa7677de75f135b6b45fdd;hp=e6cdbc8f143782b56784239e6ebde8e16b552477;hb=bc73bc67034bf875cdcace2bbc569350a3acbc80;hpb=a5e66b221dbf5a52cc770f4d7f46f05fe88784ba

diff --git a/src/php_http_message.c b/src/php_http_message.c
index e6cdbc8..371ecb7 100644
--- a/src/php_http_message.c
+++ b/src/php_http_message.c
@@ -55,7 +55,7 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h
 	int free_msg = !message;
 	zval *sval, tval;
 	php_http_message_body_t *mbody;
-	
+
 	switch (type) {
 		case PHP_HTTP_REQUEST:
 			mbody = php_http_env_get_request_body();
@@ -68,25 +68,26 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h
 				message->http.info.request.method = estrdup(Z_STRVAL_P(sval));
 			}
 			if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1))) {
-				message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), ~0);
+				message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), PHP_HTTP_URL_STDFLAGS);
 			}
-			
+
 			php_http_env_get_request_headers(&message->hdrs);
 			break;
-			
+
 		case PHP_HTTP_RESPONSE:
-			message = php_http_message_init(NULL, type, NULL);
+			message = php_http_message_init(message, type, NULL);
 			if (!SG(sapi_headers).http_status_line || !php_http_info_parse((php_http_info_t *) &message->http, SG(sapi_headers).http_status_line)) {
 				if (!(message->http.info.response.code = SG(sapi_headers).http_response_code)) {
 					message->http.info.response.code = 200;
 				}
 				message->http.info.response.status = estrdup(php_http_env_get_response_status_for_code(message->http.info.response.code));
 			}
-			
+
 			php_http_env_get_response_headers(&message->hdrs);
 			if (php_output_get_level()) {
 				if (php_output_get_status() & PHP_OUTPUT_SENT) {
 					php_error_docref(NULL, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(), php_output_get_start_lineno());
+
 					goto error;
 				} else if (SUCCESS != php_output_get_contents(&tval)) {
 					php_error_docref(NULL, E_WARNING, "Could not fetch response body");
@@ -97,7 +98,7 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h
 				}
 			}
 			break;
-			
+
 		default:
 		error:
 			if (free_msg) {
@@ -109,7 +110,7 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h
 			}
 			break;
 	}
-	
+
 	return message;
 }
 
@@ -176,24 +177,24 @@ zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary
 		popts.input.str = ct->val;
 		popts.input.len = ct->len;
 
-		if (php_http_params_parse(&params, &popts)) {
+		if (EXPECTED(php_http_params_parse(&params, &popts))) {
 			zval *cur, *arg;
 			zend_string *ct_str;
 			zend_ulong index;
 
 			zend_hash_internal_pointer_reset(&params);
 
-			if ((cur = zend_hash_get_current_data(&params))
+			if (EXPECTED((cur = zend_hash_get_current_data(&params))
 			&&	(Z_TYPE_P(cur) == IS_ARRAY)
-			&&	(HASH_KEY_IS_STRING == zend_hash_get_current_key(&params, &ct_str, &index))
+			&&	(HASH_KEY_IS_STRING == zend_hash_get_current_key(&params, &ct_str, &index)))
 			) {
 				if (php_http_match(ct_str->val, "multipart", PHP_HTTP_MATCH_WORD)) {
 					is_multipart = 1;
 
 					/* get boundary */
-					if (boundary
+					if (EXPECTED(boundary
 					&&	(arg = zend_hash_str_find(Z_ARRVAL_P(cur), ZEND_STRL("arguments")))
-					&&	Z_TYPE_P(arg) == IS_ARRAY
+					&&	Z_TYPE_P(arg) == IS_ARRAY)
 					) {
 						zval *val;
 						php_http_arrkey_t key;
@@ -203,7 +204,7 @@ zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary
 							if (key.key && key.key->len == lenof("boundary") && !strcasecmp(key.key->val, "boundary")) {
 								zend_string *bnd = zval_get_string(val);
 
-								if (bnd->len) {
+								if (EXPECTED(bnd->len)) {
 									*boundary = estrndup(bnd->val, bnd->len);
 								}
 								zend_string_release(bnd);
@@ -233,11 +234,11 @@ void php_http_message_set_type(php_http_message_t *message, php_http_message_typ
 				PTR_FREE(message->http.info.request.method);
 				PTR_FREE(message->http.info.request.url);
 				break;
-			
+
 			case PHP_HTTP_RESPONSE:
 				PTR_FREE(message->http.info.response.status);
 				break;
-			
+
 			default:
 				break;
 		}
@@ -256,12 +257,12 @@ void php_http_message_set_info(php_http_message_t *message, php_http_info_t *inf
 			PTR_SET(PHP_HTTP_INFO(message).request.url, PHP_HTTP_INFO(info).request.url ? php_http_url_copy(PHP_HTTP_INFO(info).request.url, 0) : NULL);
 			PTR_SET(PHP_HTTP_INFO(message).request.method, PHP_HTTP_INFO(info).request.method ? estrdup(PHP_HTTP_INFO(info).request.method) : NULL);
 			break;
-		
+
 		case PHP_HTTP_RESPONSE:
 			PHP_HTTP_INFO(message).response.code = PHP_HTTP_INFO(info).response.code;
 			PTR_SET(PHP_HTTP_INFO(message).response.status, PHP_HTTP_INFO(info).response.status ? estrdup(PHP_HTTP_INFO(info).response.status) : NULL);
 			break;
-		
+
 		default:
 			break;
 	}
@@ -305,30 +306,38 @@ void php_http_message_update_headers(php_http_message_t *msg)
 			zend_hash_str_del(&msg->hdrs, ZEND_STRL("Content-Length"));
 		}
 		zend_string_release(cl);
+	} else if (msg->type == PHP_HTTP_REQUEST) {
+		if (!php_http_message_header(msg, ZEND_STRL("Transfer-Encoding"))) {
+			/* no filter, no CR, no size, no TE, no CL */
+			if (0 <= php_http_select_str(msg->http.info.request.method, 3, "POST", "PUT", "PATCH")) {
+				/* quoting RFC7230#section-3.3.2
+					A user agent SHOULD send a Content-Length in a request message when
+					no Transfer-Encoding is sent and the request method defines a meaning
+					for an enclosed payload body.  For example, a Content-Length header
+					field is normally sent in a POST request even when the value is 0
+					(indicating an empty payload body).  A user agent SHOULD NOT send a
+					Content-Length header field when the request message does not contain
+					a payload body and the method semantics do not anticipate such a
+					body.
+				*/
+				ZVAL_LONG(&h, 0);
+				zend_hash_str_update(&msg->hdrs, "Content-Length", lenof("Content-Length"), &h);
+			}
+		}
 	}
 }
 
 static void message_headers(php_http_message_t *msg, php_http_buffer_t *str)
 {
 	char *tmp = NULL;
+	size_t len = 0;
 
-	switch (msg->type) {
-		case PHP_HTTP_REQUEST:
-			php_http_buffer_appendf(str, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF));
-			PTR_FREE(tmp);
-			break;
-
-		case PHP_HTTP_RESPONSE:
-			php_http_buffer_appendf(str, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF));
-			PTR_FREE(tmp);
-			break;
-
-		default:
-			break;
-	}
-
+	php_http_info_to_string((php_http_info_t *) msg, &tmp, &len, PHP_HTTP_CRLF TSRMLS_CC);
 	php_http_message_update_headers(msg);
+
+	php_http_buffer_append(str, tmp, len);
 	php_http_header_to_string(str, &msg->hdrs);
+	PTR_FREE(tmp);
 }
 
 void php_http_message_to_callback(php_http_message_t *msg, php_http_pass_callback_t cb, void *cb_arg)
@@ -392,11 +401,11 @@ void php_http_message_serialize(php_http_message_t *message, char **string, size
 php_http_message_t *php_http_message_reverse(php_http_message_t *msg)
 {
 	size_t i, c = php_http_message_count(msg);
-	
+
 	if (c > 1) {
 		php_http_message_t *tmp = msg, **arr;
 
-		arr = ecalloc(c, sizeof(**arr));
+		arr = ecalloc(c, sizeof(*arr));
 		for (i = 0; i < c; ++i) {
 			arr[i] = tmp;
 			tmp = tmp->parent;
@@ -405,11 +414,11 @@ php_http_message_t *php_http_message_reverse(php_http_message_t *msg)
 		for (i = 0; i < c-1; ++i) {
 			arr[i+1]->parent = arr[i];
 		}
-		
+
 		msg = arr[c-1];
 		efree(arr);
 	}
-	
+
 	return msg;
 }
 
@@ -435,47 +444,47 @@ php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_
 {
 	php_http_message_t *temp, *copy = NULL;
 	php_http_info_t info;
-	
+
 	if (from) {
 		info.type = from->type;
 		info.http = from->http;
-		
+
 		copy = temp = php_http_message_init(to, 0, php_http_message_body_copy(from->body, NULL));
 		php_http_message_set_info(temp, &info);
-		zend_hash_copy(&temp->hdrs, &from->hdrs, (copy_ctor_func_t) zval_add_ref);
-	
+		array_copy(&from->hdrs, &temp->hdrs);
+
 		if (parents) while (from->parent) {
 			info.type = from->parent->type;
 			info.http = from->parent->http;
-		
+
 			temp->parent = php_http_message_init(NULL, 0, php_http_message_body_copy(from->parent->body, NULL));
 			php_http_message_set_info(temp->parent, &info);
 			array_copy(&from->parent->hdrs, &temp->parent->hdrs);
-		
+
 			temp = temp->parent;
 			from = from->parent;
 		}
 	}
-	
+
 	return copy;
 }
 
 void php_http_message_dtor(php_http_message_t *message)
 {
-	if (message) {
+	if (EXPECTED(message)) {
 		zend_hash_destroy(&message->hdrs);
 		php_http_message_body_free(&message->body);
-		
+
 		switch (message->type) {
 			case PHP_HTTP_REQUEST:
 				PTR_SET(message->http.info.request.method, NULL);
 				PTR_SET(message->http.info.request.url, NULL);
 				break;
-			
+
 			case PHP_HTTP_RESPONSE:
 				PTR_SET(message->http.info.response.status, NULL);
 				break;
-			
+
 			default:
 				break;
 		}
@@ -484,7 +493,7 @@ void php_http_message_dtor(php_http_message_t *message)
 
 void php_http_message_free(php_http_message_t **message)
 {
-	if (*message) {
+	if (EXPECTED(*message)) {
 		if ((*message)->parent) {
 			php_http_message_free(&(*message)->parent);
 		}
@@ -494,8 +503,15 @@ void php_http_message_free(php_http_message_t **message)
 	}
 }
 
+static zend_class_entry *php_http_message_class_entry;
+zend_class_entry *php_http_message_get_class_entry(void)
+{
+	return php_http_message_class_entry;
+}
+
 static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *rv);
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot);
+
+static PHP_WRITE_PROP_HANDLER_TYPE php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot);
 
 static zend_object_handlers php_http_message_object_handlers;
 static HashTable php_http_message_object_prophandlers;
@@ -523,12 +539,14 @@ static php_http_message_object_prophandler_t *php_http_message_object_get_propha
 	return zend_hash_str_find_ptr(&php_http_message_object_prophandlers, name_str->val, name_str->len);
 }
 static void php_http_message_object_prophandler_get_type(php_http_message_object_t *obj, zval *return_value) {
+	zval_ptr_dtor(return_value);
 	RETVAL_LONG(obj->message->type);
 }
 static void php_http_message_object_prophandler_set_type(php_http_message_object_t *obj, zval *value) {
 	php_http_message_set_type(obj->message, zval_get_long(value));
 }
 static void php_http_message_object_prophandler_get_request_method(php_http_message_object_t *obj, zval *return_value) {
+	zval_ptr_dtor(return_value);
 	if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message) && obj->message->http.info.request.method) {
 		RETVAL_STRING(obj->message->http.info.request.method);
 	} else {
@@ -546,6 +564,7 @@ static void php_http_message_object_prophandler_get_request_url(php_http_message
 	char *url_str;
 	size_t url_len;
 
+	zval_ptr_dtor(return_value);
 	if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message) && obj->message->http.info.request.url && php_http_url_to_string(obj->message->http.info.request.url, &url_str, &url_len, 0)) {
 		RETVAL_STR(php_http_cs2zs(url_str, url_len));
 	} else {
@@ -554,10 +573,11 @@ static void php_http_message_object_prophandler_get_request_url(php_http_message
 }
 static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value) {
 	if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) {
-		PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, ~0));
+		PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, PHP_HTTP_URL_STDFLAGS));
 	}
 }
 static void php_http_message_object_prophandler_get_response_status(php_http_message_object_t *obj, zval *return_value) {
+	zval_ptr_dtor(return_value);
 	if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message) && obj->message->http.info.response.status) {
 		RETVAL_STRING(obj->message->http.info.response.status);
 	} else {
@@ -572,6 +592,7 @@ static void php_http_message_object_prophandler_set_response_status(php_http_mes
 	}
 }
 static void php_http_message_object_prophandler_get_response_code(php_http_message_object_t *obj, zval *return_value) {
+	zval_ptr_dtor(return_value);
 	if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) {
 		RETVAL_LONG(obj->message->http.info.response.code);
 	} else {
@@ -588,6 +609,7 @@ static void php_http_message_object_prophandler_get_http_version(php_http_messag
 	char *version_str;
 	size_t version_len;
 
+	zval_ptr_dtor(return_value);
 	php_http_version_to_string(&obj->message->http.version, &version_str, &version_len, NULL, NULL);
 	RETVAL_STR(php_http_cs2zs(version_str, version_len));
 }
@@ -597,28 +619,41 @@ static void php_http_message_object_prophandler_set_http_version(php_http_messag
 	zend_string_release(zs);
 }
 static void php_http_message_object_prophandler_get_headers(php_http_message_object_t *obj, zval *return_value ) {
+	zval tmp;
+
+	ZVAL_COPY_VALUE(&tmp, return_value);
 	array_init(return_value);
 	array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value));
+	zval_ptr_dtor(&tmp);
 }
 static void php_http_message_object_prophandler_set_headers(php_http_message_object_t *obj, zval *value) {
-	HashTable *headers;
-	zval *orig_value = value;
+	int converted = 0;
+	HashTable garbage, *src;
 
 	if (Z_TYPE_P(value) != IS_ARRAY && Z_TYPE_P(value) != IS_OBJECT) {
-		convert_to_array_ex(value);
+		converted = 1;
+		SEPARATE_ZVAL(value);
+		convert_to_array(value);
 	}
-	headers = HASH_OF(value);
+	src = HASH_OF(value);
+
+	garbage = obj->message->hdrs;
+	zend_hash_init(&obj->message->hdrs, zend_hash_num_elements(src), NULL, ZVAL_PTR_DTOR, 0);
+	array_copy(HASH_OF(value), &obj->message->hdrs);
 
-	zend_hash_clean(&obj->message->hdrs);
-	array_copy(headers, &obj->message->hdrs);
+	zend_hash_destroy(&garbage);
 
-	if (orig_value != value) {
+	if (converted) {
 		zval_ptr_dtor(value);
 	}
 }
 static void php_http_message_object_prophandler_get_body(php_http_message_object_t *obj, zval *return_value) {
 	if (obj->body) {
+		zval tmp;
+
+		ZVAL_COPY_VALUE(&tmp, return_value);
 		RETVAL_OBJECT(&obj->body->zo, 1);
+		zval_ptr_dtor(&tmp);
 	} else {
 		RETVAL_NULL();
 	}
@@ -628,7 +663,11 @@ static void php_http_message_object_prophandler_set_body(php_http_message_object
 }
 static void php_http_message_object_prophandler_get_parent_message(php_http_message_object_t *obj, zval *return_value) {
 	if (obj->message->parent) {
+		zval tmp;
+
+		ZVAL_COPY_VALUE(&tmp, return_value);
 		RETVAL_OBJECT(&obj->parent->zo, 1);
+		zval_ptr_dtor(&tmp);
 	} else {
 		RETVAL_NULL();
 	}
@@ -637,10 +676,10 @@ static void php_http_message_object_prophandler_set_parent_message(php_http_mess
 	if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), php_http_message_class_entry)) {
 		php_http_message_object_t *parent_obj = PHP_HTTP_OBJ(NULL, value);
 
+		Z_ADDREF_P(value);
 		if (obj->message->parent) {
-			zend_objects_store_del(&obj->parent->zo);
+			zend_object_release(&obj->parent->zo);
 		}
-		Z_ADDREF_P(value);
 		obj->parent = parent_obj;
 		obj->message->parent = parent_obj->message;
 	}
@@ -668,7 +707,7 @@ void php_http_message_object_reverse(zval *zmsg, zval *return_value)
 		php_http_message_object_t **objects;
 		int last;
 
-		objects = ecalloc(i, sizeof(**objects));
+		objects = ecalloc(i, sizeof(*objects));
 
 		/* we are the first message */
 		objects[0] = obj;
@@ -738,21 +777,21 @@ ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg
 		case IS_RESOURCE:
 			php_stream_from_zval_no_verify(s, zbody);
 			if (!s) {
-				php_http_throw(unexpected_val, "The stream is not a valid resource", NULL);
+				php_http_throw(unexpected_val, "The stream is not a valid resource");
 				return FAILURE;
 			}
 
 			is_resource:
 
 			body = php_http_message_body_init(NULL, s);
-			if (!(body_obj = php_http_message_body_object_new_ex(php_http_message_body_class_entry, body))) {
+			if (!(body_obj = php_http_message_body_object_new_ex(php_http_get_message_body_class_entry(), body))) {
 				php_http_message_body_free(&body);
 				return FAILURE;
 			}
 			break;
 
 		case IS_OBJECT:
-			if (instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry)) {
+			if (instanceof_function(Z_OBJCE_P(zbody), php_http_get_message_body_class_entry())) {
 				Z_ADDREF_P(zbody);
 				body_obj = PHP_HTTP_OBJ(NULL, zbody);
 				break;
@@ -772,7 +811,7 @@ ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg
 		body_obj->body = php_http_message_body_init(NULL, NULL);
 	}
 	if (msg_obj->body) {
-		zend_objects_store_del(&msg_obj->body->zo);
+		zend_object_release(&msg_obj->body->zo);
 	}
 	if (msg_obj->message) {
 		php_http_message_body_free(&msg_obj->message->body);
@@ -789,7 +828,7 @@ ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg
 ZEND_RESULT_CODE php_http_message_object_init_body_object(php_http_message_object_t *obj)
 {
 	php_http_message_body_addref(obj->message->body);
-	return php_http_new((void *) &obj->body, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body);
+	return php_http_new((void *) &obj->body, php_http_get_message_body_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body);
 }
 
 zend_object *php_http_message_object_new(zend_class_entry *ce)
@@ -810,7 +849,7 @@ php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce,
 		if (msg->parent) {
 			o->parent = php_http_message_object_new_ex(ce, msg->parent);
 		}
-		o->body = php_http_message_body_object_new_ex(php_http_message_body_class_entry, php_http_message_body_init(&msg->body, NULL));
+		o->body = php_http_message_body_object_new_ex(php_http_get_message_body_class_entry(), php_http_message_body_init(&msg->body, NULL));
 	}
 
 	o->zo.handlers = &php_http_message_object_handlers;
@@ -820,7 +859,7 @@ php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce,
 
 zend_object *php_http_message_object_clone(zval *this_ptr)
 {
-	php_http_message_object_t *new_obj = NULL;
+	php_http_message_object_t *new_obj;
 	php_http_message_object_t *old_obj = PHP_HTTP_OBJ(NULL, this_ptr);
 
 	new_obj = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL));
@@ -833,6 +872,8 @@ void php_http_message_object_free(zend_object *object)
 {
 	php_http_message_object_t *o = PHP_HTTP_OBJ(object, NULL);
 
+	PTR_FREE(o->gc);
+
 	if (!Z_ISUNDEF(o->iterator)) {
 		zval_ptr_dtor(&o->iterator);
 		ZVAL_UNDEF(&o->iterator);
@@ -844,56 +885,53 @@ void php_http_message_object_free(zend_object *object)
 		o->message = NULL;
 	}
 	if (o->parent) {
-		if (GC_REFCOUNT(&o->parent->zo) == 1) {
-			zend_objects_store_del(&o->parent->zo);
-		}
-		zend_objects_store_del(&o->parent->zo);
+		zend_object_release(&o->parent->zo);
 		o->parent = NULL;
 	}
 	if (o->body) {
-		if (GC_REFCOUNT(&o->body->zo) == 1) {
-			zend_objects_store_del(&o->body->zo);
-		}
-		zend_objects_store_del(&o->body->zo);
+		zend_object_release(&o->body->zo);
 		o->body = NULL;
 	}
 	zend_object_std_dtor(object);
 }
 
+#if PHP_VERSION_ID >= 70400
+static zval *php_http_message_object_get_prop_ptr(zval *object, zval *member, int type, void **cache_slot)
+{
+	return NULL;
+}
+#endif
+
 static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp)
 {
 	zval *return_value;
 	zend_string *member_name = zval_get_string(member);
 	php_http_message_object_prophandler_t *handler = php_http_message_object_get_prophandler(member_name);
 
-	if (!handler || type == BP_VAR_R || type == BP_VAR_IS) {
-		return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp);
+	return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp);
 
-		if (handler) {
+	if (handler && handler->read) {
+		if (type == BP_VAR_R || type == BP_VAR_IS) {
 			php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object);
 
-			PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
-			handler->read(obj, tmp);
-
-			zval_ptr_dtor(return_value);
-			ZVAL_COPY_VALUE(return_value, tmp);
-		}
-		zend_string_release(member_name);
-		return return_value;
-	} else {
-		php_property_proxy_t *proxy;
-		php_property_proxy_object_t *proxy_obj;
+			handler->read(obj, return_value);
+		} else {
+			php_property_proxy_t *proxy;
+			php_property_proxy_object_t *proxy_obj;
 
-		proxy = php_property_proxy_init(object, member_name);
-		proxy_obj = php_property_proxy_object_new_ex(NULL, proxy);
+			proxy = php_property_proxy_init(object, member_name);
+			proxy_obj = php_property_proxy_object_new_ex(NULL, proxy);
 
-		ZVAL_OBJ(tmp, &proxy_obj->zo);
-		zend_string_release(member_name);
-		return tmp;
+			ZVAL_OBJ(tmp, &proxy_obj->zo);
+			return_value = tmp;
+		}
 	}
+
+	zend_string_release(member_name);
+	return return_value;
 }
 
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot)
+static PHP_WRITE_PROP_HANDLER_TYPE php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot)
 {
 	php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object);
 	php_http_message_object_prophandler_t *handler;
@@ -908,6 +946,7 @@ static void php_http_message_object_write_prop(zval *object, zval *member, zval
 	}
 
 	zend_string_release(member_name);
+	PHP_WRITE_PROP_HANDLER_RETURN(value);
 }
 
 static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_temp)
@@ -920,7 +959,7 @@ static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_t
 
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 	*is_temp = 0;
-	
+
 #define UPDATE_PROP(name_str, action_with_tmp) \
 	do { \
 		zend_property_info *pi; \
@@ -989,6 +1028,32 @@ static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_t
 	return props;
 }
 
+static HashTable *php_http_message_object_get_gc(zval *object, zval **table, int *n)
+{
+	php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object);
+	HashTable *props = Z_OBJPROP_P(object);
+	uint32_t count = 2 + zend_hash_num_elements(props);
+	zval *val;
+
+	*n = 0;
+	*table = obj->gc = erealloc(obj->gc, count * sizeof(zval));
+
+	if (obj->body) {
+		ZVAL_OBJ(&obj->gc[(*n)++], &obj->body->zo);
+	}
+	if (obj->parent) {
+		ZVAL_OBJ(&obj->gc[(*n)++], &obj->parent->zo);
+	}
+
+	ZEND_HASH_FOREACH_VAL(props, val)
+	{
+		ZVAL_COPY_VALUE(&obj->gc[(*n)++], val);
+	}
+	ZEND_HASH_FOREACH_END();
+
+	return NULL;
+}
+
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, message)
 	ZEND_ARG_INFO(0, greedy)
@@ -1003,13 +1068,13 @@ static PHP_METHOD(HttpMessage, __construct)
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!b", &zmessage, &greedy), invalid_arg, return);
 
-	zend_replace_error_handling(EH_THROW, php_http_exception_bad_message_class_entry, &zeh);
+	zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_message_class_entry(), &zeh);
 	if (zmessage && Z_TYPE_P(zmessage) == IS_RESOURCE) {
 		php_stream *s;
 		php_http_message_parser_t p;
 		zend_error_handling zeh;
 
-		zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh);
+		zend_replace_error_handling(EH_THROW, php_http_get_exception_unexpected_val_class_entry(), &zeh);
 		php_stream_from_zval(s, zmessage);
 		zend_restore_error_handling(&zeh);
 
@@ -1020,7 +1085,7 @@ static PHP_METHOD(HttpMessage, __construct)
 			php_http_buffer_init_ex(&buf, 0x1000, PHP_HTTP_BUFFER_INIT_PREALLOC);
 			if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse_stream(&p, &buf, s, flags, &msg)) {
 				if (!EG(exception)) {
-					php_http_throw(bad_message, "Could not parse message from stream", NULL);
+					php_http_throw(bad_message, "Could not parse message from stream");
 				}
 			}
 			php_http_buffer_dtor(&buf);
@@ -1028,7 +1093,7 @@ static PHP_METHOD(HttpMessage, __construct)
 		}
 
 		if (!msg && !EG(exception)) {
-			php_http_throw(bad_message, "Empty message received from stream", NULL);
+			php_http_throw(bad_message, "Empty message received from stream");
 		}
 	} else if (zmessage) {
 		zend_string *zs_msg = zval_get_string(zmessage);
@@ -1036,7 +1101,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->val);
+			php_http_throw(bad_message, "Could not parse message: %.*s", (int) MIN(25, zs_msg->len), zs_msg->val);
 		}
 		zend_string_release(zs_msg);
 	}
@@ -1065,7 +1130,6 @@ static PHP_METHOD(HttpMessage, getBody)
 
 	if (!obj->body) {
 		php_http_message_object_init_body_object(obj);
-
 	}
 	if (obj->body) {
 		RETVAL_OBJECT(&obj->body->zo, 1);
@@ -1079,7 +1143,7 @@ static PHP_METHOD(HttpMessage, setBody)
 {
 	zval *zbody;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &zbody, php_http_message_body_class_entry)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &zbody, php_http_get_message_body_class_entry())) {
 		php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
@@ -1095,7 +1159,7 @@ static PHP_METHOD(HttpMessage, addBody)
 {
 	zval *new_body;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &new_body, php_http_message_body_class_entry)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &new_body, php_http_get_message_body_class_entry())) {
 		php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 		php_http_message_body_object_t *new_obj = PHP_HTTP_OBJ(NULL, new_body);
 
@@ -1124,7 +1188,7 @@ static PHP_METHOD(HttpMessage, getHeader)
 		if ((header = php_http_message_header(obj->message, header_str, header_len))) {
 			if (!header_ce) {
 				RETURN_ZVAL(header, 1, 0);
-			} else if (instanceof_function(header_ce, php_http_header_class_entry)) {
+			} else if (instanceof_function(header_ce, php_http_header_get_class_entry())) {
 				php_http_object_method_t cb;
 				zval argv[2];
 
@@ -1209,6 +1273,38 @@ static PHP_METHOD(HttpMessage, setHeaders)
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
 
+static inline void php_http_message_object_add_header(php_http_message_object_t *obj, const char *name_str, size_t name_len, zval *zvalue)
+{
+	char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
+	zend_string *hstr, *vstr;
+	zval *header, tmp;
+
+	if (Z_TYPE_P(zvalue) == IS_NULL) {
+		return;
+	}
+
+	vstr = php_http_header_value_to_string(zvalue);
+
+	if ((name_len != lenof("Set-Cookie") && strcmp(name, "Set-Cookie"))
+	&&	(hstr = php_http_message_header_string(obj->message, name, name_len))) {
+		char *hdr_str;
+		size_t hdr_len = spprintf(&hdr_str, 0, "%s, %s", hstr->val, vstr->val);
+
+		ZVAL_STR(&tmp, php_http_cs2zs(hdr_str, hdr_len));
+		zend_symtable_str_update(&obj->message->hdrs, name, name_len, &tmp);
+		zend_string_release(hstr);
+		zend_string_release(vstr);
+	} else if ((header = php_http_message_header(obj->message, name, name_len))) {
+		convert_to_array(header);
+		ZVAL_STR(&tmp, vstr);
+		zend_hash_next_index_insert(Z_ARRVAL_P(header), &tmp);
+	} else {
+		ZVAL_STR(&tmp, vstr);
+		zend_symtable_str_update(&obj->message->hdrs, name, name_len, &tmp);
+	}
+	efree(name);
+}
+
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_addHeader, 0, 0, 2)
 	ZEND_ARG_INFO(0, header)
 	ZEND_ARG_INFO(0, value)
@@ -1221,19 +1317,10 @@ static PHP_METHOD(HttpMessage, addHeader)
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "sz", &name_str, &name_len, &zvalue)) {
 		php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
-		char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
-		zval *header;
 
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
-		Z_TRY_ADDREF_P(zvalue);
-		if ((header = php_http_message_header(obj->message, name, name_len))) {
-			convert_to_array(header);
-			zend_hash_next_index_insert(Z_ARRVAL_P(header), zvalue);
-		} else {
-			zend_symtable_str_update(&obj->message->hdrs, name, name_len, zvalue);
-		}
-		efree(name);
+		php_http_message_object_add_header(obj, name_str, name_len, zvalue);
 	}
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
@@ -1252,7 +1339,20 @@ static PHP_METHOD(HttpMessage, addHeaders)
 
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
-		array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY);
+		if (append) {
+			php_http_arrkey_t key = {0};
+			zval *val;
+
+			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(new_headers), key.h, key.key, val)
+			{
+				php_http_arrkey_stringify(&key, NULL);
+				php_http_message_object_add_header(obj, key.key->val, key.key->len, val);
+				php_http_arrkey_dtor(&key);
+			}
+			ZEND_HASH_FOREACH_END();
+		} else {
+			array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, 0, ARRAY_JOIN_PRETTIFY|ARRAY_JOIN_STRONLY);
+		}
 	}
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
@@ -1292,25 +1392,12 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpMessage, getInfo)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
-		char *str, *tmp = NULL;
-		size_t len;
+		char *str = NULL;
+		size_t len = 0;
 		php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
-
-		switch (obj->message->type) {
-			case PHP_HTTP_REQUEST:
-				len = spprintf(&str, 0, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, tmp, ""));
-				PTR_FREE(tmp);
-				break;
-			case PHP_HTTP_RESPONSE:
-				len = spprintf(&str, 0, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, tmp, ""));
-				PTR_FREE(tmp);
-				break;
-			default:
-				RETURN_NULL();
-				break;
-		}
+		php_http_info_to_string((php_http_info_t *) obj->message, &str, &len, "");
 
 		RETVAL_STR(php_http_cs2zs(str, len));
 	}
@@ -1390,7 +1477,7 @@ static PHP_METHOD(HttpMessage, getResponseCode)
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 		if (obj->message->type != PHP_HTTP_RESPONSE) {
-			php_error_docref(NULL, E_WARNING, "http\\Message is not if type response");
+			php_error_docref(NULL, E_WARNING, "http\\Message is not of type response");
 			RETURN_FALSE;
 		}
 
@@ -1414,7 +1501,7 @@ static PHP_METHOD(HttpMessage, setResponseCode)
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 	if (obj->message->type != PHP_HTTP_RESPONSE) {
-		php_http_throw(bad_method_call, "http\\Message is not of type response", NULL);
+		php_http_throw(bad_method_call, "http\\Message is not of type response");
 		return;
 	}
 
@@ -1466,7 +1553,7 @@ static PHP_METHOD(HttpMessage, setResponseStatus)
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 	if (obj->message->type != PHP_HTTP_RESPONSE) {
-		php_http_throw(bad_method_call, "http\\Message is not of type response", NULL);
+		php_http_throw(bad_method_call, "http\\Message is not of type response");
 	}
 
 	PTR_SET(obj->message->http.info.response.status, estrndup(status, status_len));
@@ -1511,12 +1598,12 @@ static PHP_METHOD(HttpMessage, setRequestMethod)
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 	if (obj->message->type != PHP_HTTP_REQUEST) {
-		php_http_throw(bad_method_call, "http\\Message is not of type request", NULL);
+		php_http_throw(bad_method_call, "http\\Message is not of type request");
 		return;
 	}
 
 	if (method_len < 1) {
-		php_http_throw(invalid_arg, "Cannot set http\\Message's request method to an empty string", NULL);
+		php_http_throw(invalid_arg, "Cannot set http\\Message's request method to an empty string");
 		return;
 	}
 
@@ -1567,17 +1654,17 @@ static PHP_METHOD(HttpMessage, setRequestUrl)
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 	if (obj->message->type != PHP_HTTP_REQUEST) {
-		php_http_throw(bad_method_call, "http\\Message is not of type request", NULL);
+		php_http_throw(bad_method_call, "http\\Message is not of type request");
 		return;
 	}
 
-	zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh);
-	url = php_http_url_from_zval(zurl, ~0);
+	zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_url_class_entry(), &zeh);
+	url = php_http_url_from_zval(zurl, PHP_HTTP_URL_STDFLAGS);
 	zend_restore_error_handling(&zeh);
 
 	if (url && php_http_url_is_empty(url)) {
 		php_http_url_free(&url);
-		php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string", NULL);
+		php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string");
 	} else if (url) {
 		PTR_SET(obj->message->http.info.request.url, url);
 	}
@@ -1597,7 +1684,7 @@ static PHP_METHOD(HttpMessage, getParentMessage)
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 	if (!obj->message->parent) {
-		php_http_throw(unexpected_val, "http\\Message has not parent message", NULL);
+		php_http_throw(unexpected_val, "http\\Message has no parent message");
 		return;
 	}
 
@@ -1667,7 +1754,7 @@ static PHP_METHOD(HttpMessage, toCallback)
 		zend_fcall_info_args_clear(&fcd.fci, 1);
 		zval_ptr_dtor(&fcd.fcz);
 
-		RETURN_ZVAL(getThis(), 1, 0);
+		RETURN_ZVAL(&fcd.fcz, 1, 0);
 	}
 }
 
@@ -1754,7 +1841,7 @@ static PHP_METHOD(HttpMessage, prepend)
 	for (msg[0] = obj->message; msg[0]; msg[0] = msg[0]->parent) {
 		for (msg[1] = prepend_obj->message; msg[1]; msg[1] = msg[1]->parent) {
 			if (msg[0] == msg[1]) {
-				php_http_throw(unexpected_val, "Cannot prepend a message located within the same message chain", NULL);
+				php_http_throw(unexpected_val, "Cannot prepend a message located within the same message chain");
 				return;
 			}
 		}
@@ -1814,7 +1901,7 @@ static PHP_METHOD(HttpMessage, splitMultipartBody)
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 	if (!php_http_message_is_multipart(obj->message, &boundary)) {
-		php_http_throw(bad_method_call, "http\\Message is not a multipart message", NULL);
+		php_http_throw(bad_method_call, "http\\Message is not a multipart message");
 		return;
 	}
 
@@ -1915,7 +2002,7 @@ static PHP_METHOD(HttpMessage, current)
 }
 
 static zend_function_entry php_http_message_methods[] = {
-	PHP_ME(HttpMessage, __construct,        ai_HttpMessage___construct,        ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(HttpMessage, __construct,        ai_HttpMessage___construct,        ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessage, getBody,            ai_HttpMessage_getBody,            ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessage, setBody,            ai_HttpMessage_setBody,            ZEND_ACC_PUBLIC)
 	PHP_ME(HttpMessage, addBody,            ai_HttpMessage_addBody,            ZEND_ACC_PUBLIC)
@@ -1970,8 +2057,6 @@ static zend_function_entry php_http_message_methods[] = {
 	EMPTY_FUNCTION_ENTRY
 };
 
-zend_class_entry *php_http_message_class_entry;
-
 PHP_MINIT_FUNCTION(http_message)
 {
 	zend_class_entry ce = {0};
@@ -1986,7 +2071,12 @@ PHP_MINIT_FUNCTION(http_message)
 	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_debug_info = php_http_message_object_get_debug_info;
+#if PHP_VERSION_ID >= 70400
+	php_http_message_object_handlers.get_property_ptr_ptr = php_http_message_object_get_prop_ptr;
+#else
 	php_http_message_object_handlers.get_property_ptr_ptr = NULL;
+#endif
+	php_http_message_object_handlers.get_gc = php_http_message_object_get_gc;
 
 	zend_class_implements(php_http_message_class_entry, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);
 
@@ -2032,4 +2122,3 @@ PHP_MSHUTDOWN_FUNCTION(http_message)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
-