X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_curl_client.c;h=01678d8c2d0a66d1f981f5ec0b36c47633226197;hb=d3cd2c4fb0abc0400276e46a8452e7d9297129ce;hp=97b04a229200e6bf70bc0d4a1e96dc93ae77c864;hpb=5913db177b07398233cb00d2357aba595eab8371;p=m6w6%2Fext-http diff --git a/php_http_curl_client.c b/php_http_curl_client.c index 97b04a2..01678d8 100644 --- a/php_http_curl_client.c +++ b/php_http_curl_client.c @@ -1279,7 +1279,7 @@ PHP_HTTP_API php_http_client_ops_t *php_http_curl_client_get_ops(void) #define PHP_HTTP_CURL_CLIENT_ME(method, visibility) PHP_ME(HttpClientCURL, method, PHP_HTTP_ARGS(HttpClientCURL, method), visibility) #define PHP_HTTP_CURL_CLIENT_CLIENT_MALIAS(me, vis) ZEND_FENTRY(me, ZEND_MN(HttpClient_##me), PHP_HTTP_ARGS(HttpClientCURL, me), vis) -PHP_HTTP_BEGIN_ARGS(send, 1) +PHP_HTTP_BEGIN_ARGS(send, 0) PHP_HTTP_ARG_VAL(request, 0) PHP_HTTP_END_ARGS; @@ -1307,7 +1307,11 @@ zend_object_value php_http_curl_client_object_new_ex(zend_class_entry *ce, php_h o = ecalloc(1, sizeof(php_http_client_object_t)); 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 if (!(o->client = r)) { o->client = php_http_client_init(NULL, &php_http_curl_client_ops, NULL, NULL TSRMLS_CC);