allow interrupted message parsing from stream

[m6w6/ext-http] / php_http_client.c

diff --git a/php_http_client.c b/php_http_client.c
index 8f51a03a9c535c9ce91ca9deed9691a4b7ebaa40..0de62c9bdbd33bbcc9610459efb25dc1f1ed90e2 100644 (file)
--- a/php_http_client.c
+++ b/php_http_client.c
@@ -296,11 +296,8 @@ 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;
 
@@ -919,7 +916,6 @@ PHP_METHOD(HttpClient, request)
 
        with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
                if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a!z!a!/", &meth_str, &meth_len, &url_str, &url_len, &zheader, &zbody, &zoptions)) {
-                       php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
                        php_http_message_object_t *msg_obj;
                        zend_object_value ov;
                        zval *req, *res = NULL;