X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=6c378a224e5926827f95c50d23c92920e020588b;hb=e6eb95d3183f3a00257c9bb698ad74919e0d181a;hp=3c98bd0cda94d31fd1e522641e58462be1c23833;hpb=c7a5f1c64f8d4597fabf313c4597736836239815;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index 3c98bd0..6c378a2 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"
+#define PHP_EXT_HTTP_VERSION "1.0.0RC5-dev"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -33,9 +33,7 @@
 #ifdef HTTP_WANT_SAPI
 #	if PHP_API_VERSION > 20041225
 #		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)
 #	endif
 #	include "SAPI.h"
 #endif
@@ -47,6 +45,9 @@
 #	elif defined(HAVE_NETDB_H)
 #		define HTTP_HAVE_NETDB
 #		include <netdb.h>
+#		ifdef HAVE_UNISTD_H
+#			include <unistd.h>
+#		endif
 #	endif
 #endif
 
@@ -56,6 +57,7 @@
 #		define CURL_STATICLIB
 #	endif
 #	include <curl/curl.h>
+#	define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
 #endif
 
 #if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
@@ -111,18 +113,17 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 	} send;
 
 	struct _http_globals_request {
+		time_t time;
 		struct _http_globals_request_methods {
 			char *allowed;
 			struct _http_globals_request_methods_custom {
+				char *ini;
 				int count;
 				void *entries;
 			} custom;
 		} methods;
 	} request;
 
-#ifndef HTTP_HAVE_SAPI_RTIME
-	time_t request_time;
-#endif
 #ifdef ZEND_ENGINE_2
 	zend_bool only_exceptions;
 #endif
@@ -136,17 +137,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);
@@ -167,6 +166,7 @@ PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);
+PHP_FUNCTION(http_parse_params);
 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);
 PHP_FUNCTION(http_get_request_body_stream);
@@ -176,16 +176,16 @@ PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_fields);
+PHP_FUNCTION(http_put_data);
 PHP_FUNCTION(http_put_file);
 PHP_FUNCTION(http_put_stream);
+PHP_FUNCTION(http_request);
+PHP_FUNCTION(http_request_body_encode);
 #endif /* HTTP_HAVE_CURL */
 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);
@@ -195,12 +195,6 @@ PHP_FUNCTION(ob_inflatehandler);
 #endif
 PHP_FUNCTION(http_support);
 
-PHP_MINIT_FUNCTION(http);
-PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
-PHP_RSHUTDOWN_FUNCTION(http);
-PHP_MINFO_FUNCTION(http);
-
 #endif	/* PHP_HTTP_H */
 
 /*