- fix typo

- the global datashare should really use the global handle

diff --git a/http.c b/http.c
index 51d452ab47c6ddebc667425df563d34592e9e175..5a0b05897ca2783cc008ec056a543a4eae74b620 100644 (file)
--- a/http.c
+++ b/http.c
@@ -241,7 +241,7 @@ PHP_INI_BEGIN()
 #ifdef ZEND_ENGINE_2
        HTTP_PHP_INI_ENTRY("http.request.datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.cookie)
        HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
-       HTTP_PHP_INI_ENTRY("http.request.datashare.sll", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
+       HTTP_PHP_INI_ENTRY("http.request.datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
        HTTP_PHP_INI_ENTRY("http.request.datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.connect)
 #endif
 #ifdef HTTP_HAVE_ZLIB

diff --git a/http_request_datashare_api.c b/http_request_datashare_api.c
index 4983377dd0e3a34ebfb1fbdeda2e8e736f1d24b3..efcdb848e657fd346b637a41560480ae4bddcbe5 100644 (file)
--- a/http_request_datashare_api.c
+++ b/http_request_datashare_api.c
@@ -32,6 +32,11 @@ static int http_request_datashare_compare_handles(void *h1, void *h2);
 static void http_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr);
 static void http_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr);
 
+http_request_datashare *_http_request_datashare_global_get(void)
+{
+       return &http_request_datashare_global;
+}
+
 PHP_MINIT_FUNCTION(http_request_datashare)
 {
        curl_lock_data val;

diff --git a/http_requestdatashare_object.c b/http_requestdatashare_object.c
index e3872f632f36c0db4cbc77445c63b16339d60665..451aefe7ddceb6687ceaa5423366387b99f99ed4 100644 (file)
--- a/http_requestdatashare_object.c
+++ b/http_requestdatashare_object.c
@@ -272,7 +272,7 @@ static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool
        if (!this_ptr) {
                MAKE_STD_ZVAL(this_ptr);
                Z_TYPE_P(this_ptr) = IS_OBJECT;
-               this_ptr->value.obj = http_requestdatashare_object_new(http_requestdatashare_object_ce);
+               this_ptr->value.obj = http_requestdatashare_object_new_ex(http_requestdatashare_object_ce, global ? http_request_datashare_global_get() : NULL, NULL);
        }
        if (global) {
                if (HTTP_G->request.datashare.cookie) {

diff --git a/package2.xml b/package2.xml
index a5a29350edd9c4dcb422fd78d53d87ac6c64c267..829948f79f7ae4a6a2e5b58bb70691cb4fe55499 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -198,6 +198,7 @@ support. Parallel requests are available for PHP 5 and greater.
     <file role="test" name="HttpRequest_009.phpt"/>
     <file role="test" name="HttpRequest_010.phpt"/>
     <file role="test" name="HttpRequestDataShare_001.phpt"/>
+    <file role="test" name="HttpRequestDataShare_002.phpt"/>
     <file role="test" name="HttpRequestPool_001.phpt"/>
     <file role="test" name="HttpRequestPool_002.phpt"/>
     <file role="test" name="HttpRequestPool_003.phpt"/>

diff --git a/php_http_request_datashare_api.h b/php_http_request_datashare_api.h
index 179124e1292b4801780999644850edcf333f076f..831712f6df8e6c4ed33192212f78ca668bb36d0d 100644 (file)
--- a/php_http_request_datashare_api.h
+++ b/php_http_request_datashare_api.h
@@ -28,6 +28,9 @@ typedef struct _http_request_datashare_t {
        http_request_datashare_lock *locks;
 } http_request_datashare;
 
+#define http_request_datashare_global_get _http_request_datashare_global_get
+extern http_request_datashare *_http_request_datashare_global_get(void);
+
 extern PHP_MINIT_FUNCTION(http_request_datashare);
 extern PHP_MSHUTDOWN_FUNCTION(http_request_datashare);
 

diff --git a/tests/HttpRequestDataShare_002.phpt b/tests/HttpRequestDataShare_002.phpt
new file mode 100644 (file)
index 0000000..0b2f0ac
--- /dev/null
+++ b/tests/HttpRequestDataShare_002.phpt
@@ -0,0 +1,37 @@
+--TEST--
+HttpRequestDataShare global
+--SKIPIF--
+<?php
+include "skip.inc";
+checkcls("HttpRequestDataShare");
+?>
+--INI--
+http.request.datashare.cookie = 1
+--FILE--
+<?php
+echo "-TEST\n";
+
+$s = HttpRequestDataShare::singleton(true);
+
+$r1 = new HttpRequest("http://www.google.com/");
+$r2 = new HttpRequest("http://www.google.com/");
+
+$r1->enableCookies();
+$r2->enableCookies();
+
+$s->attach($r1);
+$s->attach($r2);
+
+$r1->send();
+$r2->send();
+
+$s->reset();
+
+var_dump(current($r1->getResponseCookies())->cookies["PREF"] === HttpUtil::parseCookie($r2->getRequestMessage()->getHeader("Cookie"))->cookies["PREF"]);
+
+echo "Done\n";
+?>
+--EXPECTF--
+%sTEST
+bool(true)
+Done