X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=0cd759cf18302bf76a38f2bc2efaf8dfe58ed662;hb=a458b9a25cf0ec9b4d8bde2b22e43c44d71427c8;hp=67dcc3556404c9cc506af706e7eff33dc47fb769;hpb=d3485e3b28336153dca690e872ffe1ddc60fedd2;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index 67dcc35..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
 
@@ -38,19 +36,6 @@
 #	define PHP_HTTP_API
 #endif
 
-#include <main/SAPI.h>
-#include <main/fopen_wrappers.h>
-#include <main/php_streams.h>
-#include <main/php_variables.h>
-#include <Zend/zend_exceptions.h>
-#include <Zend/zend_interfaces.h>
-#include <ext/date/php_date.h>
-#include <ext/spl/spl_array.h>
-#include <ext/spl/spl_iterators.h>
-#include <ext/standard/php_lcg.h>
-#include <ext/standard/php_string.h>
-#include <ext/standard/url.h>
-
 /* make functions that return SUCCESS|FAILURE more obvious */
 typedef int STATUS;
 
@@ -59,13 +44,10 @@ 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
-#	undef PHP_ATOM_INC
-#	include <ext/iconv/php_iconv.h>
 #endif
 
 #if (defined(HAVE_HASH_EXT) || defined(PHP_HTTP_HAVE_EXT_HASH)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(PHP_HTTP_HAVE_PHP_HASH_H)
 #	define PHP_HTTP_HAVE_HASH
-#	include "php_hash.h"
 #endif
 
 #ifdef PHP_WIN32
@@ -80,34 +62,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)))
-
-#if defined(ZTS) && defined(PHP_HTTP_HAVE_SSL)
-#	ifdef PHP_WIN32
-#		define PHP_HTTP_NEED_OPENSSL_TSL
-#		include <openssl/crypto.h>
-#	else /* !PHP_WIN32 */
-#		if defined(PHP_HTTP_HAVE_OPENSSL)
-#			define PHP_HTTP_NEED_OPENSSL_TSL
-#			include <openssl/crypto.h>
-#		elif defined(PHP_HTTP_HAVE_GNUTLS)
-#			define PHP_HTTP_NEED_GNUTLS_TSL
-#			include <gcrypt.h>
-#		else
-#			warning \
-				"libcurl was compiled with SSL support, but configure could not determine which" \
-				"library was used; thus no SSL crypto locking callbacks will be set, which may " \
-				"cause random crashes on SSL requests"
-#		endif /* PHP_HTTP_HAVE_OPENSSL || PHP_HTTP_HAVE_GNUTLS */
-#	endif /* PHP_WIN32 */
-#endif /* ZTS && PHP_HTTP_HAVE_SSL */
-
-#include <zlib.h>
 #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))
@@ -117,11 +71,21 @@ 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_filter.h"
@@ -134,11 +98,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"
@@ -148,14 +116,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;
-	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)
 
 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