- (non-)ZTS fixes

[m6w6/ext-http] / http_requestdatashare_object.c

diff --git a/http_requestdatashare_object.c b/http_requestdatashare_object.c
index e3872f632f36c0db4cbc77445c63b16339d60665..af8e9d49426f0ee0d80b18c8dbb273f748510936 100644 (file)
--- a/http_requestdatashare_object.c
+++ b/http_requestdatashare_object.c
@@ -193,7 +193,7 @@ PHP_METHOD(HttpRequestDataShare, count)
        
        NO_ARGS;
        
-       RETURN_LONG(zend_llist_count(&obj->share->handles));
+       RETURN_LONG(zend_llist_count(HTTP_RSHARE_HANDLES(obj->share)));
 }
 /* }}} */
 
@@ -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) {