X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=3def97fdccc0102109e21faec0d63119338bda0b;hp=b4c4ab3419d693ceae29cc8b1adb7dd6dd97a407;hb=32e91737086db53bb1fd9ed9f79d693c43ec459f;hpb=14819be2113881e1030d23c6a1a32e17083ab406

diff --git a/php_http.h b/php_http.h
index b4c4ab3..3def97f 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -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,11 +118,11 @@ 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);
-PHP_FUNCTION(http_build_uri);
+PHP_FUNCTION(http_build_url);
 PHP_FUNCTION(http_negotiate_language);
 PHP_FUNCTION(http_negotiate_charset);
 PHP_FUNCTION(http_negotiate_content_type);
@@ -148,10 +163,10 @@ PHP_FUNCTION(http_build_query);
 #endif /* ZEND_ENGINE_2 */
 PHP_FUNCTION(ob_etaghandler);
 #ifdef HTTP_HAVE_ZLIB
-PHP_FUNCTION(http_gzencode);
-PHP_FUNCTION(http_gzdecode);
 PHP_FUNCTION(http_deflate);
 PHP_FUNCTION(http_inflate);
+PHP_FUNCTION(ob_deflatehandler);
+PHP_FUNCTION(ob_inflatehandler);
 #endif
 PHP_FUNCTION(http_support);