X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=4bd31d74c03829dec7033abc49f8264a5c0b3b5d;hp=9b7fc3cd1c4bd67d507886b8e93ace8b9b38446a;hb=7ea5445a6250f29f09d6b97db124cacf457f23c5;hpb=28676404f30a0814a8e027d63b3cec4959475c46

diff --git a/php_http.h b/php_http.h
index 9b7fc3c..4bd31d7 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 "1.0.0RC3"
+#define PHP_EXT_HTTP_VERSION "1.3.0dev"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -26,16 +26,13 @@
 #endif
 
 #include "php.h"
+#include "missing.h"
 #include "php_http_std_defs.h"
 #include "phpstr/phpstr.h"
-#include "missing.h"
 
 #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
@@ -91,6 +88,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 	struct _http_globals_log {
 		char *cache;
 		char *redirect;
+		char *not_found;
 		char *allowed_methods;
 		char *composite;
 	} log;
@@ -112,21 +110,30 @@ 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;
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+		struct _http_globals_request_datashare {
+			zend_llist handles;
+			zend_bool cookie;
+			zend_bool dns;
+			zend_bool ssl;
+			zend_bool connect;
+		} datashare;
+#endif
 	} request;
 
-#ifndef HTTP_HAVE_SAPI_RTIME
-	time_t request_time;
-#endif
 #ifdef ZEND_ENGINE_2
 	zend_bool only_exceptions;
 #endif
@@ -145,6 +152,22 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #	define HTTP_G (&http_globals)
 #endif
 
+#if defined(HAVE_ICONV) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
+#	define HTTP_HAVE_ICONV
+#endif
+
+#if defined(HAVE_PHP_SESSION) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_SESSION))
+#	define HTTP_HAVE_SESSION
+#endif
+
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(HTTP_HAVE_PHP_HASH_H)
+#	define HTTP_HAVE_HASH
+#endif
+
+#if defined(HAVE_SPL)
+#	define HTTP_HAVE_SPL
+#endif
+
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_build_url);
@@ -169,6 +192,8 @@ PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);
+PHP_FUNCTION(http_build_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);