X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=2313413f30af7761cd216f34bbd45718c8f8df20;hp=08b6ba82829520be42d0e8ba15878fb2e3a0a1b1;hb=e438aa9ce944f8c8f175554d9aa66d152a47f780;hpb=a09f5d91e8618abe63f27f39000757dded9d844e;ds=sidebyside

diff --git a/php_http_api.h b/php_http_api.h
index 08b6ba8..2313413 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -106,15 +106,22 @@
 
 ZEND_BEGIN_MODULE_GLOBALS(php_http)
 	struct php_http_env_globals env;
+#ifdef PHP_HTTP_HAVE_CLIENT
+	struct {
+#ifdef PHP_HTTP_HAVE_CURL
+		struct php_http_client_curl_globals curl;
+#endif
+	} client;
+#endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
 ZEND_EXTERN_MODULE_GLOBALS(php_http);
 
 #ifdef ZTS
 #	include "TSRM/TSRM.h"
-#	define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
+#	define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
 #	undef TSRMLS_FETCH_FROM_CTX
-#	define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = ((ctx)?(ctx):ts_resource_ex(0, NULL))
+#	define TSRMLS_FETCH_FROM_CTX(ctx) ERROR
 #else
 #	define PHP_HTTP_G (&php_http_globals)
 #endif