X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=7c966fc3efa22f39d4d76ba50144ca37904e1692;hp=4dc95327450cebe0152e3b02af1b018795f6318a;hb=a07b79b1871054ca17e48b69445b4dc201f24662;hpb=84db30e7a19ccab0526f20476dace985d05eca3d

diff --git a/php_http.h b/php_http.h
index 4dc9532..7c966fc 100644
--- a/php_http.h
+++ b/php_http.h
@@ -64,13 +64,6 @@ typedef int STATUS;
 #	endif
 #endif
 
-#ifdef PHP_HTTP_HAVE_EVENT
-//#	include <event.h>
-#endif
-
-#include <curl/curl.h>
-#define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
-
 #include <ctype.h>
 #define PHP_HTTP_IS_CTYPE(type, c) is##type((int) (unsigned char) (c))
 #define PHP_HTTP_TO_CTYPE(type, c) to##type((int) (unsigned char) (c))
@@ -80,13 +73,24 @@ extern zend_module_entry http_module_entry;
 
 extern int http_module_number;
 
+#if PHP_DEBUG
+#	define _DPF_STR	0
+#	define _DPF_IN	1
+#	define _DPF_OUT	2
+extern void _dpf(int type, const char *data, size_t length);
+#else
+#	define _dpf(t,s,l);
+#endif
+
 #include "php_http_misc.h"
 
 #include "php_http_cookie.h"
 #include "php_http_encoding.h"
 #include "php_http_env.h"
+#include "php_http_env_response.h"
 #include "php_http_etag.h"
 #include "php_http_exception.h"
+#include "php_http_fluently_callable.h"
 #include "php_http_filter.h"
 #include "php_http_headers.h"
 #include "php_http_info.h"
@@ -97,11 +101,15 @@ extern int http_module_number;
 #include "php_http_negotiate.h"
 #include "php_http_object.h"
 #include "php_http_params.h"
+#include "php_http_resource_factory.h"
 #include "php_http_persistent_handle.h"
 #include "php_http_property_proxy.h"
 #include "php_http_querystring.h"
 #include "php_http_request_datashare.h"
+#include "php_http_request_factory.h"
 #include "php_http_request.h"
+#include "php_http_curl.h"
+#include "php_http_neon.h"
 #include "php_http_request_method.h"
 #include "php_http_request_pool.h"
 #include "php_http_url.h"
@@ -111,14 +119,18 @@ ZEND_BEGIN_MODULE_GLOBALS(php_http)
 	struct php_http_env_globals env;
 	struct php_http_persistent_handle_globals persistent_handle;
 	struct php_http_request_datashare_globals request_datashare;
+#ifdef PHP_HTTP_HAVE_EVENT
 	struct php_http_request_pool_globals request_pool;
+#endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
 ZEND_EXTERN_MODULE_GLOBALS(php_http);
 
 #ifdef ZTS
 #	include "TSRM/TSRM.h"
-#	define PHP_HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
+#	define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_ls))[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))
 #else
 #	define PHP_HTTP_G (&php_http_globals)
 #endif