adopt persistent handle API
authorMichael Wallner <mike@php.net>
Thu, 7 Feb 2013 13:49:44 +0000 (13:49 +0000)
committerMichael Wallner <mike@php.net>
Thu, 7 Feb 2013 13:49:44 +0000 (13:49 +0000)
php_http_client_factory.c
php_http_curl_client.c
php_http_curl_client_datashare.c
php_http_curl_client_pool.c

index ef774240f74f8c26f8112380b87fb8bd87607bee..318c63b1676c76d6843a1b42092704aae53548e5 100644 (file)
@@ -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);
                                                }
 
index 23b8855e1e4104da4c08f337791610978800104e..174fa150d76f066e3b57938398ad228dd52d62a6 100644 (file)
@@ -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;
        }
 
index 1957c2bdba92308aad65b7c071a13e37cc7420e6..38377cc973a1294ed0dc56b6e9703299ab8ea83f 100644 (file)
@@ -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;
        }
 
index 6d04b538fdf54bae1edd2b3d175a847fe7ab51ba..2fc391e58f6be879bb1f1d0cf4fab53e36cac1bd 100644 (file)
@@ -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;
        }