X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=7d20048083321bfab807c6938b929f7ee45d9b79;hp=6586d06229a848b4ef73ab33872c731ff43c2aa0;hb=d046681a7b929ef813849cfe38fbceb333f0b0eb;hpb=7b88d9022c90eb12e5fe195af8644935141c9d68

diff --git a/php_http.h b/php_http.h
index 6586d06..7d20048 100644
--- a/php_http.h
+++ b/php_http.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,17 +15,35 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.21.0dev"
+#define PHP_EXT_HTTP_VERSION "0.22.0-dev"
+
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#else
+#	include "php_config.h"
+#endif
 
 #include "php.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
+
 #ifdef HTTP_WANT_NETDB
 #	ifdef PHP_WIN32
+#		define HTTP_HAVE_NETDB
 #		include <winsock2.h>
 #	elif defined(HAVE_NETDB_H)
+#		define HTTP_HAVE_NETDB
 #		include <netdb.h>
 #	endif
 #endif
@@ -56,8 +74,6 @@ extern zend_module_entry http_module_entry;
 
 extern int http_module_number;
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 ZEND_BEGIN_MODULE_GLOBALS(http)
 
 	struct _http_globals_etag {
@@ -95,18 +111,27 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 	struct _http_globals_request {
 		struct _http_globals_request_methods {
 			char *allowed;
-			HashTable custom;
+			struct _http_globals_request_methods_custom {
+				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
 
 	zend_bool force_exit;
+	zend_bool read_post_data;
 
 ZEND_END_MODULE_GLOBALS(http)
 
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
 #ifdef ZTS
 #	include "TSRM.h"
 #	define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
@@ -115,7 +140,7 @@ ZEND_END_MODULE_GLOBALS(http)
 #	define HTTP_G(v) (http_globals.v)
 #	define HTTP_GLOBALS (&http_globals)
 #endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
+#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
@@ -142,6 +167,7 @@ PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);
 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);
+PHP_FUNCTION(http_get_request_body_stream);
 PHP_FUNCTION(http_match_request_header);
 #ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);