X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=7302098ea1fa4a02308255c30ba11c6ca1ae1eed;hb=1052c4986a794b051dc48ba4118dbd6fd8f83c49;hp=e41c51c459a1ea167babb6b10744e5aacec8f10a;hpb=480cee83b4b427ecdb8621cbf42ed86a12a29df0;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index e41c51c..7302098 100644
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.22.0-dev"
+#define PHP_EXT_HTTP_VERSION "0.23.0dev"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -35,7 +35,7 @@
 #		define HTTP_HAVE_SAPI_RTIME
 #		define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
 #	else
-#		define HTTP_GET_REQUEST_TIME() HTTP_G(request_time)
+#		define HTTP_GET_REQUEST_TIME() HTTP_G->request_time
 #	endif
 #	include "SAPI.h"
 #endif
@@ -47,6 +47,9 @@
 #	elif defined(HAVE_NETDB_H)
 #		define HTTP_HAVE_NETDB
 #		include <netdb.h>
+#		ifdef HAVE_UNISTD_H
+#			include <unistd.h>
+#		endif
 #	endif
 #endif
 
@@ -136,17 +139,15 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 
 #ifdef ZTS
 #	include "TSRM.h"
-#	define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
-#	define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
+#	define HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
 #else
-#	define HTTP_G(v) (http_globals.v)
-#	define HTTP_GLOBALS (&http_globals)
+#	define HTTP_G (&http_globals)
 #endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_build_url);
+PHP_FUNCTION(http_build_str);
 PHP_FUNCTION(http_negotiate_language);
 PHP_FUNCTION(http_negotiate_charset);
 PHP_FUNCTION(http_negotiate_content_type);
@@ -183,9 +184,6 @@ PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);
 PHP_FUNCTION(http_request_method_exists);
 PHP_FUNCTION(http_request_method_name);
-#ifndef ZEND_ENGINE_2
-PHP_FUNCTION(http_build_query);
-#endif /* ZEND_ENGINE_2 */
 PHP_FUNCTION(ob_etaghandler);
 #ifdef HTTP_HAVE_ZLIB
 PHP_FUNCTION(http_deflate);