release 2.4.0

[m6w6/ext-http] / php_http_api.h

diff --git a/php_http_api.h b/php_http_api.h
index f48d464dc761289e64f17fe7e389173ef1fbc83d..08b6ba82829520be42d0e8ba15878fb2e3a0a1b1 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -23,23 +23,24 @@
 #include <php.h>
 #include <SAPI.h>
 
+#include <ext/raphf/php_raphf.h>
+#include <ext/propro/php_propro.h>
 #include <ext/standard/php_string.h>
 #include <ext/spl/spl_iterators.h>
 #include <ext/date/php_date.h>
 
 #include <zend_interfaces.h>
+#include <zend_exceptions.h>
+
 
 #ifdef PHP_WIN32
 # define PHP_HTTP_API __declspec(dllexport)
 #elif defined(__GNUC__) && __GNUC__ >= 4
-# define PHP_HTTP_API __attribute__ ((visibility("default")))
+# define PHP_HTTP_API extern __attribute__ ((visibility("default")))
 #else
-# define PHP_HTTP_API
+# define PHP_HTTP_API extern
 #endif
 
-/* make functions that return SUCCESS|FAILURE more obvious */
-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
 #endif
@@ -48,22 +49,24 @@ typedef int STATUS;
 #      define PHP_HTTP_HAVE_HASH
 #endif
 
-#if (defined(HAVE_JSON) || defined(PHP_HTTP_HAVE_EXT_JSON)) && (PHP_HTTP_SHARED_DEPS || !defined(COMPILE_DL_JSON))
-#      define PHP_HTTP_HAVE_JSON
-#endif
+#include <stddef.h>
 
 #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>
+#else
+#      ifdef HAVE_NETDB_H
+#              include <netdb.h>
+#      endif
 #      ifdef HAVE_UNISTD_H
 #              include <unistd.h>
 #      endif
 #endif
 
+#if defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H) && defined(HAVE_ISWALNUM) && (defined(HAVE_MBRTOWC) || defined(HAVE_MBTOWC))
+#      define PHP_HTTP_HAVE_WCHAR 1
+#endif
+
 #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))
@@ -71,9 +74,7 @@ typedef int STATUS;
 #include "php_http.h"
 
 #include "php_http_buffer.h"
-#include "php_http_strlist.h"
 #include "php_http_misc.h"
-#include "php_http_resource_factory.h"
 #include "php_http_options.h"
 
 #include "php_http.h"
@@ -88,35 +89,23 @@ typedef int STATUS;
 #include "php_http_exception.h"
 #include "php_http_filter.h"
 #include "php_http_header_parser.h"
-#include "php_http_headers.h"
+#include "php_http_header.h"
 #include "php_http_message_body.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_client_interface.h"
 #include "php_http_client.h"
 #include "php_http_curl.h"
 #include "php_http_client_request.h"
 #include "php_http_client_response.h"
-#include "php_http_curl_client.h"
-#include "php_http_client_pool.h"
-#include "php_http_curl_client_pool.h"
-#include "php_http_client_datashare.h"
-#include "php_http_curl_client_datashare.h"
-#include "php_http_client_factory.h"
+#include "php_http_client_curl.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;
-#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);