From: Michael Wallner Date: Thu, 7 Feb 2013 13:49:44 +0000 (+0000) Subject: adopt persistent handle API X-Git-Tag: RELEASE_2_1_0_RC3~10^2^2~39 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=aa7ae53bc07a9a737d9957de80d86e6c5bb8fd0d;p=m6w6%2Fext-http adopt persistent handle API --- diff --git a/php_http_client_factory.c b/php_http_client_factory.c index ef77424..318c63b 100644 --- a/php_http_client_factory.c +++ b/php_http_client_factory.c @@ -139,7 +139,7 @@ PHP_METHOD(HttpClientFactory, createClient) name_len = spprintf(&name_str, 0, "http_client.%s", Z_STRVAL_P(zdriver)); - if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) { + if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi), NULL, NULL TSRMLS_CC))) { rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void *)) php_persistent_handle_abandon); } @@ -196,7 +196,7 @@ PHP_METHOD(HttpClientFactory, createPool) name_len = spprintf(&name_str, 0, "http_client_pool.%s", Z_STRVAL_P(zdriver)); - if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) { + if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi), NULL, NULL TSRMLS_CC))) { rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void *)) php_persistent_handle_abandon); } @@ -261,7 +261,7 @@ PHP_METHOD(HttpClientFactory, createDataShare) name_len = spprintf(&name_str, 0, "http_client_datashare.%s", Z_STRVAL_P(zdriver)); - if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) { + if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi), NULL, NULL TSRMLS_CC))) { rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void *)) php_persistent_handle_abandon); } diff --git a/php_http_curl_client.c b/php_http_curl_client.c index 23b8855..174fa15 100644 --- a/php_http_curl_client.c +++ b/php_http_curl_client.c @@ -1432,7 +1432,7 @@ PHP_MINIT_FUNCTION(http_curl_client) { php_http_options_t *options; - if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client.curl"), &php_http_curl_client_resource_factory_ops, NULL, NULL)) { + if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client.curl"), &php_http_curl_client_resource_factory_ops, NULL, NULL TSRMLS_CC)) { return FAILURE; } diff --git a/php_http_curl_client_datashare.c b/php_http_curl_client_datashare.c index 1957c2b..38377cc 100644 --- a/php_http_curl_client_datashare.c +++ b/php_http_curl_client_datashare.c @@ -212,7 +212,7 @@ zend_object_value php_http_curl_client_datashare_object_new_ex(zend_class_entry PHP_MINIT_FUNCTION(http_curl_client_datashare) { - if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client_datashare.curl"), &php_http_curlsh_resource_factory_ops, NULL, NULL)) { + if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client_datashare.curl"), &php_http_curlsh_resource_factory_ops, NULL, NULL TSRMLS_CC)) { return FAILURE; } diff --git a/php_http_curl_client_pool.c b/php_http_curl_client_pool.c index 6d04b53..2fc391e 100644 --- a/php_http_curl_client_pool.c +++ b/php_http_curl_client_pool.c @@ -546,7 +546,7 @@ zend_object_value php_http_curl_client_pool_object_new_ex(zend_class_entry *ce, PHP_MINIT_FUNCTION(http_curl_client_pool) { - if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client_pool.curl"), &php_http_curlm_resource_factory_ops, NULL, NULL)) { + if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client_pool.curl"), &php_http_curlm_resource_factory_ops, NULL, NULL TSRMLS_CC)) { return FAILURE; }