X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=2313413f30af7761cd216f34bbd45718c8f8df20;hp=ec18293dc125d9c2e7930a6a4eb29c86de69d7a2;hb=4bf1b4570329514fa00dc68c6e02f581c3792d73;hpb=4f9f3e9032252995b600ed4c4ea538e6302730a2

diff --git a/php_http_api.h b/php_http_api.h
index ec18293..2313413 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -41,9 +41,6 @@
 # define PHP_HTTP_API extern
 #endif
 
-/* make functions that return SUCCESS|FAILURE more obvious */
-typedef int STATUS;
-
 #if (defined(HAVE_ICONV) || defined(PHP_HTTP_HAVE_EXT_ICONV)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
 #	define PHP_HTTP_HAVE_ICONV
 #endif
@@ -109,15 +106,22 @@ typedef int STATUS;
 
 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