X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=08b2a4db4009ae7b908fa5bf4552c48e13ee8420;hp=4aa2679dd2ccb5a7b76574c7422f0ba43085dd7c;hb=46fc12676a53668d55fe6d02d44210e2eaf4b6b5;hpb=bf86dcdcd68677a8c4b7c8193388c529a55a3503

diff --git a/php_http.h b/php_http.h
index 4aa2679..08b2a4d 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.23.0dev"
+#define PHP_EXT_HTTP_VERSION "1.0.0-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
@@ -59,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)
@@ -90,6 +89,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 	struct _http_globals_log {
 		char *cache;
 		char *redirect;
+		char *not_found;
 		char *allowed_methods;
 		char *composite;
 	} log;
@@ -111,21 +111,21 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 			long start_flags;
 			void *stream;
 		} inflate;
+		zend_bool not_found_404;
 	} 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
@@ -139,13 +139,12 @@ 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
+
+#define HTTP_HAVE_EXT(EXT) ((defined(HAVE_##EXT) || defined(HAVE_PHP_##EXT)) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_##EXT)))
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
@@ -171,6 +170,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);
@@ -180,8 +180,13 @@ 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);
+#ifdef HAVE_CURL_GETFORMDATA
+PHP_FUNCTION(http_request_body_encode);
+#endif /* HAVE_CURL_GETFORMDATA */
 #endif /* HTTP_HAVE_CURL */
 PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);
@@ -196,12 +201,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 */
 
 /*