X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_client.c;h=8a63acd7ca2d37ce622c304562780d69c425ba36;hb=287edcbfb698ff402588f7057dae0bc994d6e8e4;hp=f131136a1d0222021cd137e85d21f91f7b7b0fca;hpb=5913db177b07398233cb00d2357aba595eab8371;p=m6w6%2Fext-http

diff --git a/php_http_client.c b/php_http_client.c
index f131136..8a63acd 100644
--- a/php_http_client.c
+++ b/php_http_client.c
@@ -296,8 +296,11 @@ zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_c
 
 	o = ecalloc(1, sizeof(*o));
 	zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
+#if PHP_VERSION_ID < 50339
+	zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*));
+#else
 	object_properties_init((zend_object *) o, ce);
-
+#endif
 	ov.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC);
 	ov.handlers = &php_http_client_object_handlers;
 
@@ -419,10 +422,10 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC)
 	zval_ptr_dtor(&info);
 
 	if ((msg = obj->client->response.message)) {
-		/* FIXME: update history */
 		if (i_zend_is_true(zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) {
 			zval *new_hist, *old_hist = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), 0 TSRMLS_CC);
-			zend_object_value ov = php_http_client_object_message(zclient, php_http_message_copy(msg, NULL) TSRMLS_CC);
+			php_http_message_t *zipped = php_http_message_zip(obj->client->response.message, obj->client->request.message);
+			zend_object_value ov = php_http_client_object_message(zclient, zipped TSRMLS_CC);
 
 			MAKE_STD_ZVAL(new_hist);
 			ZVAL_OBJVAL(new_hist, ov, 0);
@@ -458,7 +461,7 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC)
 
 			/* update the actual request message */
 			MAKE_STD_ZVAL(message);
-			ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_get_class_entry(), php_http_message_copy_ex(msg, NULL, 0), NULL TSRMLS_CC), 0);
+			ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_get_class_entry(), msg, NULL TSRMLS_CC), 0);
 			zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("requestMessage"), message TSRMLS_CC);
 			zval_ptr_dtor(&message);
 			obj->client->request.message = php_http_message_init(NULL, 0 TSRMLS_CC);
@@ -955,7 +958,7 @@ PHP_METHOD(HttpClient, send)
 	RETVAL_FALSE;
 
 	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
-		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O!", &zreq, php_http_client_request_get_class_entry())) {
+		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O!", &zreq, php_http_client_request_get_class_entry())) {
 			if (SUCCESS == php_http_client_object_handle_request(getThis(), &zreq TSRMLS_CC)) {
 				php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 				php_http_message_object_t *req = zend_object_store_get_object(zreq TSRMLS_CC);