X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_api.h;fp=src%2Fphp_http_api.h;h=b26469458b06ca77aed704dbe4c4966dddcec644;hp=08b6ba82829520be42d0e8ba15878fb2e3a0a1b1;hb=43a9a6f8cb56e25c3770d652ce77045f89f68ca6;hpb=a1d6c90d8630ec1385f10052656d129498720adf

diff --git a/src/php_http_api.h b/src/php_http_api.h
index 08b6ba8..b264694 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>
@@ -101,20 +101,29 @@
 #include "php_http_client_request.h"
 #include "php_http_client_response.h"
 #include "php_http_client_curl.h"
+#include "php_http_client_curl_user.h"
+#include "php_http_client_curl_event.h"
 #include "php_http_url.h"
 #include "php_http_version.h"
 
 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