batch renaming: client*curl curl*client

[m6w6/ext-http] / php_http_api.h

diff --git a/php_http_api.h b/php_http_api.h
index 5cf64c989c89093a845cb81e43d1e04c78cc199c..2334404f31f7b1aea20caf43b67ffc1ba3b2491e 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -17,9 +17,14 @@
 #include "config.h"
 #endif
 
-#include <php.h>
 #include <php_config.h>
+#include <php.h>
 #include <SAPI.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)
@@ -61,6 +66,8 @@ 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"
@@ -71,6 +78,7 @@ typedef int STATUS;
 #include "php_http_curl.h"
 #include "php_http_encoding.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"
@@ -82,25 +90,27 @@ typedef int STATUS;
 #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_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 +127,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 */