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

diff --git a/php_http.h b/php_http.h
index 67dcc35..8e341ca 100644
--- a/php_http.h
+++ b/php_http.h
@@ -6,161 +6,20 @@
     | 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-2013, 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
 
 #define PHP_HTTP_EXT_VERSION "2.0.0dev"
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#else
-#	ifndef PHP_WIN32
-#		include "php_config.h"
-#	endif
-#endif
-
-#include "php.h"
-#if defined(PHP_WIN32)
-#	if defined(PHP_HTTP_EXPORTS)
-#		define PHP_HTTP_API __declspec(dllexport)
-#	elif defined(COMPILE_DL_HTTP)
-#		define PHP_HTTP_API __declspec(dllimport)
-#	else
-#		define PHP_HTTP_API
-#	endif
-#else
-#	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;
-
-#include "php_http_buffer.h"
-#include "php_http_strlist.h"
-
-#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
-#	define CURL_STATICLIB
-#	define PHP_HTTP_HAVE_NETDB
-#	include <winsock2.h>
-#elif defined(HAVE_NETDB_H)
-#	define PHP_HTTP_HAVE_NETDB
-#	include <netdb.h>
-#	ifdef HAVE_UNISTD_H
-#		include <unistd.h>
-#	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))
-
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
 
 extern int http_module_number;
 
-#include "php_http_misc.h"
-
-#include "php_http_cookie.h"
-#include "php_http_encoding.h"
-#include "php_http_env.h"
-#include "php_http_etag.h"
-#include "php_http_exception.h"
-#include "php_http_filter.h"
-#include "php_http_headers.h"
-#include "php_http_info.h"
-#include "php_http_header_parser.h"
-#include "php_http_message_body.h"
-#include "php_http_message.h"
-#include "php_http_message_parser.h"
-#include "php_http_negotiate.h"
-#include "php_http_object.h"
-#include "php_http_params.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.h"
-#include "php_http_request_method.h"
-#include "php_http_request_pool.h"
-#include "php_http_url.h"
-#include "php_http_version.h"
-
-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;
-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)])
-#else
-#	define PHP_HTTP_G (&php_http_globals)
-#endif
-
-
 #endif	/* PHP_EXT_HTTP_H */
 
 /*