less intrusive fix

[m6w6/ext-http] / php_http_request_factory.c

diff --git a/php_http_request_factory.c b/php_http_request_factory.c
index b1655f6b8fd7c44113b3a099f28695a3af529ed1..79e348f15a95b5f1ec15d6945b92b5455062e650 100644 (file)
--- a/php_http_request_factory.c
+++ b/php_http_request_factory.c
@@ -73,7 +73,6 @@ PHP_HTTP_BEGIN_ARGS(createDataShare, 0)
        PHP_HTTP_ARG_OBJ(http\\Request, request2, 1)
        PHP_HTTP_ARG_OBJ(http\\Request, requestN, 1)
 PHP_HTTP_END_ARGS;
-PHP_HTTP_EMPTY_ARGS(getGlobalDataShareInstance);
 PHP_HTTP_EMPTY_ARGS(getDriver);
 PHP_HTTP_EMPTY_ARGS(getAvailableDrivers);
 
@@ -83,7 +82,6 @@ zend_function_entry php_http_request_factory_method_entry[] = {
        PHP_HTTP_REQUEST_FACTORY_ME(createRequest, ZEND_ACC_PUBLIC)
        PHP_HTTP_REQUEST_FACTORY_ME(createPool, ZEND_ACC_PUBLIC)
        PHP_HTTP_REQUEST_FACTORY_ME(createDataShare, ZEND_ACC_PUBLIC)
-       PHP_HTTP_REQUEST_FACTORY_ME(getGlobalDataShareInstance, ZEND_ACC_PUBLIC)
        PHP_HTTP_REQUEST_FACTORY_ME(getDriver, ZEND_ACC_PUBLIC)
        PHP_HTTP_REQUEST_FACTORY_ME(getAvailableDrivers, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 
@@ -149,13 +147,7 @@ PHP_METHOD(HttpRequestFactory, createRequest)
                                                name_len = spprintf(&name_str, 0, "http_request.%s", Z_STRVAL_P(zdriver));
 
                                                if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
-                                                       php_http_resource_factory_ops_t ops = {
-                                                                       (php_http_resource_factory_handle_ctor_t) php_http_persistent_handle_acquire,
-                                                                       (php_http_resource_factory_handle_copy_t) php_http_persistent_handle_accrete,
-                                                                       (php_http_resource_factory_handle_dtor_t) php_http_persistent_handle_release
-                                                       };
-
-                                                       rf = php_http_resource_factory_init(NULL, &ops, pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+                                                       rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
                                                }
 
                                                efree(name_str);
@@ -226,13 +218,7 @@ PHP_METHOD(HttpRequestFactory, createPool)
                                                name_len = spprintf(&name_str, 0, "http_request_pool.%s", Z_STRVAL_P(zdriver));
 
                                                if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
-                                                       php_http_resource_factory_ops_t ops = {
-                                                                       (php_http_resource_factory_handle_ctor_t) php_http_persistent_handle_acquire,
-                                                                       (php_http_resource_factory_handle_copy_t) php_http_persistent_handle_accrete,
-                                                                       (php_http_resource_factory_handle_dtor_t) php_http_persistent_handle_release
-                                                       };
-
-                                                       rf = php_http_resource_factory_init(NULL, &ops, pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+                                                       rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
                                                }
 
                                                efree(name_str);
@@ -293,19 +279,13 @@ PHP_METHOD(HttpRequestFactory, createDataShare)
                                                name_len = spprintf(&name_str, 0, "http_request_datashare.%s", Z_STRVAL_P(zdriver));
 
                                                if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
-                                                       php_http_resource_factory_ops_t ops = {
-                                                                       (php_http_resource_factory_handle_ctor_t) php_http_persistent_handle_acquire,
-                                                                       (php_http_resource_factory_handle_copy_t) php_http_persistent_handle_accrete,
-                                                                       (php_http_resource_factory_handle_dtor_t) php_http_persistent_handle_release
-                                                       };
-
-                                                       rf = php_http_resource_factory_init(NULL, &ops, pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+                                                       rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
                                                }
 
                                                efree(name_str);
                                        }
 
-                                       share = php_http_request_datashare_init(NULL, driver.request_datashare_ops, rf, NULL, 0 TSRMLS_CC);
+                                       share = php_http_request_datashare_init(NULL, driver.request_datashare_ops, rf, NULL TSRMLS_CC);
                                        if (share) {
                                                if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_request_datashare_object_new_ex, php_http_request_datashare_class_entry, share, NULL TSRMLS_CC)) {
                                                        ZVAL_OBJVAL(return_value, ov, 0);
@@ -328,48 +308,6 @@ PHP_METHOD(HttpRequestFactory, createDataShare)
        } end_error_handling();
 }
 
-PHP_METHOD(HttpRequestFactory, getGlobalDataShareInstance)
-{
-       with_error_handling(EH_THROW, php_http_exception_class_entry) {
-               if (SUCCESS == zend_parse_parameters_none()) {
-                       with_error_handling(EH_THROW, php_http_exception_class_entry) {
-                               zval *instance = *zend_std_get_static_property(php_http_request_datashare_class_entry, ZEND_STRL("instance"), 0, NULL TSRMLS_CC);
-
-                               if (Z_TYPE_P(instance) != IS_OBJECT) {
-                                       zval *zdriver;
-                                       zend_object_value ov;
-                                       zend_class_entry *class_entry;
-                                       php_http_request_datashare_t *share;
-
-                                       if (!(class_entry = php_http_request_factory_get_class_entry(getThis(), ZEND_STRL("requestDataShareClass") TSRMLS_CC))) {
-                                               class_entry = php_http_request_datashare_class_entry;
-                                       }
-
-                                       if ((zdriver = zend_read_property(php_http_request_factory_class_entry, getThis(), ZEND_STRL("driver"), 0 TSRMLS_CC))
-                                       &&      (IS_STRING == Z_TYPE_P(zdriver))
-                                       &&      (share = php_http_request_datashare_global_get(Z_STRVAL_P(zdriver), Z_STRLEN_P(zdriver) TSRMLS_CC))
-                                       &&      (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_request_datashare_object_new_ex, php_http_request_datashare_class_entry, share, NULL TSRMLS_CC))
-                                       ) {
-                                               MAKE_STD_ZVAL(instance);
-                                               ZVAL_OBJVAL(instance, ov, 0);
-                                               zend_update_static_property(php_http_request_datashare_class_entry, ZEND_STRL("instance"), instance TSRMLS_CC);
-
-                                               if (PHP_HTTP_G->request_datashare.cookie) {
-                                                       zend_update_property_bool(php_http_request_datashare_class_entry, instance, ZEND_STRL("cookie"), PHP_HTTP_G->request_datashare.cookie TSRMLS_CC);
-                                               }
-                                               if (PHP_HTTP_G->request_datashare.dns) {
-                                                       zend_update_property_bool(php_http_request_datashare_class_entry, instance, ZEND_STRL("dns"), PHP_HTTP_G->request_datashare.dns TSRMLS_CC);
-                                               }
-                                       }
-                               }
-
-                               RETVAL_ZVAL(instance, 1, 0);
-                       } end_error_handling();
-               }
-       } end_error_handling();
-}
-
-
 PHP_METHOD(HttpRequestFactory, getDriver)
 {
        if (SUCCESS == zend_parse_parameters_none()) {