- happy new year

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 6586d06229a848b4ef73ab33872c731ff43c2aa0..3def97fdccc0102109e21faec0d63119338bda0b 100644 (file)
--- 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -56,8 +56,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,7 +93,10 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        struct _http_globals_request {
                struct _http_globals_request_methods {
                        char *allowed;
-                       HashTable custom;
+                       struct {
+                               int count;
+                               void *entries;
+                       } custom;
                } methods;
        } request;
 
@@ -107,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)
@@ -115,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);