X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=100bd477bd461b86bd2d41fb7176c3c392f661be;hp=62cb1bc2cea794265fec9376a98493f29c9187d4;hb=85f5451a3e9fad7cb9728ba5408b433fca22b44b;hpb=aca5a5a21e4514707a71cfa69cc19ae50a78f5d3

diff --git a/php_http.h b/php_http.h
index 62cb1bc..100bd47 100644
--- 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.0dev"
+#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);