add json content type handler if ext/json is present

[m6w6/ext-http] / php_http_api.h

diff --git a/php_http_api.h b/php_http_api.h
index ebb6218c892363efa5a185f75b5d6ff6e58c76ac..72ebf4dc49ebd8cf9113dd71b08bc08d25c7e39a 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -50,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
@@ -78,6 +82,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"
@@ -94,19 +99,22 @@ typedef int STATUS;
 #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