X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=0cd759cf18302bf76a38f2bc2efaf8dfe58ed662;hb=8f4e7071199fd04eeb59fe83179fe3a822f4852e;hp=b1bc57c4d6cacca6c9c17e81279e00a04733fb40;hpb=4d708279b6956fc95b253ddc88671fb2f0e5aa39;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index b1bc57c..0cd759c 100644
--- a/php_http.h
+++ b/php_http.h
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http.h 300300 2010-06-09 07:29:35Z mike $ */
-
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
@@ -90,7 +88,6 @@ extern void _dpf(int type, const char *data, size_t length);
 #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"
@@ -119,8 +116,8 @@ 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;
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+	struct php_http_curl_globals curl;
 #endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
@@ -128,9 +125,9 @@ ZEND_EXTERN_MODULE_GLOBALS(php_http);
 
 #ifdef ZTS
 #	include "TSRM/TSRM.h"
-#	define PHP_HTTP_G ((php_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) ((ctx)?(ctx):ts_resource_ex(0, NULL))
+#	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