* Fixed crashes with repeated registering/unregisitering of request methods (noticed...

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 005498b35bdf28adb0f44a8ded6bb7af9f96f4ec..100bd477bd461b86bd2d41fb7176c3c392f661be 100644 (file)
--- 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.5.0RC1"
+#define PHP_EXT_HTTP_VERSION "1.5.3dev"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
@@ -120,12 +120,9 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                time_t time;
                HashTable *headers;
                struct _http_globals_request_methods {
+                       HashTable registered;
                        char *allowed;
-                       struct _http_globals_request_methods_custom {
-                               char *ini;
-                               int count;
-                               void *entries;
-                       } custom;
+                       char *custom;
                } methods;
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
                struct _http_globals_request_datashare {
@@ -138,9 +135,9 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 #endif
        } request;
 
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
        struct _http_globals_persistent {
                struct _http_globals_persistent_handles {
+                       ulong limit;
                        struct _http_globals_persistent_handles_ident {
                                ulong h;
                                char *s;
@@ -148,7 +145,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                        } ident;
                } handles;
        } persistent;
-#endif
+
 #ifdef ZEND_ENGINE_2
        zend_bool only_exceptions;
 #endif
@@ -213,12 +210,10 @@ 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
-#      ifdef HTTP_HAVE_PERSISTENT_HANDLES
 PHP_FUNCTION(http_persistent_handles_count);
 PHP_FUNCTION(http_persistent_handles_clean);
 PHP_FUNCTION(http_persistent_handles_ident);
-#      endif
+#ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);