X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=793b21334371e0f1846deb92e482019f063036a5;hb=08bec19979c75a45978c7c7a7c6d7926a9d5322e;hp=f74af3ccb4b4dc55ef3bfce8c906b6deb084c705;hpb=a19f558421040b5396b3d76e6c4878d7eda85aba;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index f74af3c..793b213 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,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.21.0dev"
+#define PHP_EXT_HTTP_VERSION "0.21.0"
 
 #include "php.h"
 #include "php_http_std_defs.h"
@@ -77,13 +77,26 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 		char *content_type;
 		char *unquoted_etag;
 		time_t last_modified;
-		int gzip_encoding;
+		struct _http_globals_send_deflate {
+			zend_bool start_auto;
+			long start_flags;
+			int encoding;
+			void *stream;
+		} deflate;
+		struct _http_globals_send_inflate {
+			zend_bool start_auto;
+			long start_flags;
+			void *stream;
+		} inflate;
 	} send;
 
 	struct _http_globals_request {
 		struct _http_globals_request_methods {
 			char *allowed;
-			HashTable custom;
+			struct {
+				int count;
+				void *entries;
+			} custom;
 		} methods;
 	} request;
 
@@ -95,6 +108,8 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 
 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)
@@ -103,7 +118,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);
@@ -150,6 +165,8 @@ PHP_FUNCTION(ob_etaghandler);
 #ifdef HTTP_HAVE_ZLIB
 PHP_FUNCTION(http_deflate);
 PHP_FUNCTION(http_inflate);
+PHP_FUNCTION(ob_deflatehandler);
+PHP_FUNCTION(ob_inflatehandler);
 #endif
 PHP_FUNCTION(http_support);