X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_request_factory.c;h=1f5f24141805ede4010b01966c801ec9beefcaef;hb=a4fd0a809ae831f21cbaec14e24c3d3ee0569c12;hp=f0e6680e6b19207c6ba76b1b1009aec037432213;hpb=25299586e95bdb7a1c522df19c4c690955bfac1b;p=m6w6%2Fext-http

diff --git a/php_http_request_factory.c b/php_http_request_factory.c
index f0e6680..1f5f241 100644
--- a/php_http_request_factory.c
+++ b/php_http_request_factory.c
@@ -1,9 +1,18 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
+#include "php_http_api.h"
 
-#include "php_http.h"
-
-#include <ext/standard/php_string.h>
 #include <ext/spl/spl_observer.h>
-#include <Zend/zend_interfaces.h>
 
 /*
  * array of name => php_http_request_factory_driver_t*
@@ -64,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);
 
@@ -74,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)
 
@@ -296,7 +303,7 @@ PHP_METHOD(HttpRequestFactory, createDataShare)
 						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);
@@ -319,48 +326,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()) {
@@ -407,3 +372,13 @@ PHP_MSHUTDOWN_FUNCTION(http_request_factory)
 	return SUCCESS;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+