X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=42d34fca4bfc611f9c72dc942cfacbc1d070fcdc;hp=bc3a2f5231f8bfc234fe971873eaa3aa897398e1;hb=47be714b40e14b6b5cdc2f35a7994efd13c2076e;hpb=6cc24086f57aa1e8f4d6a2c12361635e7c24f60f

diff --git a/php_http_api.h b/php_http_api.h
index bc3a2f5..42d34fc 100644
--- 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-2013, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -17,26 +17,28 @@
 #include "config.h"
 #endif
 
+#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>
+#include <zend_exceptions.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 extern __attribute__ ((visibility("default")))
 #else
-#	define PHP_HTTP_API
+# define PHP_HTTP_API extern
 #endif
 
 /* make functions that return SUCCESS|FAILURE more obvious */
@@ -50,6 +52,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
@@ -60,6 +66,9 @@ typedef int STATUS;
 #	ifdef HAVE_UNISTD_H
 #		include <unistd.h>
 #	endif
+#	ifdef HAVE_ERRNO_H
+#		include <errno.h>
+#	endif
 #endif
 
 #include <ctype.h>
@@ -71,12 +80,13 @@ typedef int STATUS;
 #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"
@@ -84,32 +94,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_info.h"
-#include "php_http_message.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_client_curl.h"
-#include "php_http_client_pool.h"
-#include "php_http_client_pool_curl.h"
-#include "php_http_client_datashare.h"
-#include "php_http_client_datashare_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