X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_api.h;h=7fe3d1050e57f8e50255a4e8856c3d4f20649600;hb=refs%2Ftags%2FRELEASE_3_1_0_BETA2;hp=8c0b9bee17cf835a03df379e9b6b0ab2a2b7bb17;hpb=e761c34103c0c5316cce092ea42a789b95e887d2;p=m6w6%2Fext-http

diff --git a/src/php_http_api.h b/src/php_http_api.h
index 8c0b9be..7fe3d10 100644
--- a/src/php_http_api.h
+++ b/src/php_http_api.h
@@ -23,8 +23,8 @@
 #include "php.h"
 #include "SAPI.h"
 
-#include "ext/raphf/php_raphf.h"
-#include "ext/propro/php_propro.h"
+#include "ext/raphf/php_raphf_api.h"
+#include "ext/propro/php_propro_api.h"
 #include "ext/standard/php_string.h"
 #include "ext/spl/spl_iterators.h"
 #include "ext/date/php_date.h"
@@ -108,15 +108,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