X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=31e70df26ffedcc03ea9b46e96875855ac2be68c;hp=5cf64c989c89093a845cb81e43d1e04c78cc199c;hb=8191c55421fb6ecc86185608a8b0510da1525e1e;hpb=29a54250b58e444974ae19840194e214cab80bd5

diff --git a/php_http_api.h b/php_http_api.h
index 5cf64c9..31e70df 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -17,21 +17,26 @@
 #include "config.h"
 #endif
 
-#include <php.h>
+#ifndef PHP_WIN32
 #include <php_config.h>
+#endif
+#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>
 
-#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
+#ifdef PHP_WIN32
+# define PHP_HTTP_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_HTTP_API __attribute__ ((visibility("default")))
 #else
-#	define PHP_HTTP_API
+# define PHP_HTTP_API
 #endif
 
 /* make functions that return SUCCESS|FAILURE more obvious */
@@ -45,6 +50,10 @@ 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
+
 #ifdef PHP_WIN32
 #	define CURL_STATICLIB
 #	define PHP_HTTP_HAVE_NETDB
@@ -61,46 +70,48 @@ typedef int STATUS;
 #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))
 
+#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"
 #include "php_http_cookie.h"
-#include "php_http_curl.h"
 #include "php_http_encoding.h"
+#include "php_http_info.h"
+#include "php_http_message.h"
 #include "php_http_env.h"
+#include "php_http_env_request.h"
 #include "php_http_env_response.h"
 #include "php_http_etag.h"
 #include "php_http_exception.h"
 #include "php_http_filter.h"
 #include "php_http_header_parser.h"
 #include "php_http_headers.h"
-#include "php_http_info.h"
-#include "php_http_message.h"
 #include "php_http_message_body.h"
 #include "php_http_message_parser.h"
 #include "php_http_negotiate.h"
-#include "php_http_neon.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.h"
-#include "php_http_request_datashare.h"
-#include "php_http_request_factory.h"
-#include "php_http_request_method.h"
-#include "php_http_request_pool.h"
-#include "php_http_serf.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_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;
 #if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
 	struct php_http_curl_globals curl;
 #endif
@@ -117,6 +128,15 @@ ZEND_EXTERN_MODULE_GLOBALS(php_http);
 #	define PHP_HTTP_G (&php_http_globals)
 #endif
 
+#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
+
 #endif /* PHP_HTTP_API_H */