Merge R_2_5

[m6w6/ext-http] / php_http_api.h

diff --git a/php_http_api.h b/php_http_api.h
index 0e65ccb6315f3c9483de784e1abd8cd23909449b..2313413f30af7761cd216f34bbd45718c8f8df20 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -41,9 +41,6 @@
 # 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
@@ -52,9 +49,7 @@ 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
@@ -68,6 +63,10 @@ typedef int STATUS;
 #      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))
@@ -75,7 +74,6 @@ 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_options.h"
 
@@ -108,15 +106,22 @@ typedef int STATUS;
 
 ZEND_BEGIN_MODULE_GLOBALS(php_http)
        struct php_http_env_globals env;
+#ifdef PHP_HTTP_HAVE_CLIENT
+       struct {
+#ifdef PHP_HTTP_HAVE_CURL
+               struct php_http_client_curl_globals curl;
+#endif
+       } client;
+#endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
 ZEND_EXTERN_MODULE_GLOBALS(php_http);
 
 #ifdef ZTS
 #      include "TSRM/TSRM.h"
-#      define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
+#      define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
 #      undef TSRMLS_FETCH_FROM_CTX
-#      define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = ((ctx)?(ctx):ts_resource_ex(0, NULL))
+#      define TSRMLS_FETCH_FROM_CTX(ctx) ERROR
 #else
 #      define PHP_HTTP_G (&php_http_globals)
 #endif