X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=ab53b85de4a8cc9d6517f1352f4d519767ca69b2;hb=9676c81efbb8f180fa189d71a7ecb50dde4f5646;hp=ac5051efd3a936e07c70954337fb638c9f432091;hpb=24035853a9019d25c215eb63249de02a80675bcc;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index ac5051e..ab53b85 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.0RC4"
+#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
@@ -91,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;
@@ -112,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
@@ -183,7 +182,9 @@ 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);