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

diff --git a/php_http.h b/php_http.h
index a3d6bd8..100bd47 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-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -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,6 +135,17 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 #endif
 	} request;
 
+	struct _http_globals_persistent {
+		struct _http_globals_persistent_handles {
+			ulong limit;
+			struct _http_globals_persistent_handles_ident {
+				ulong h;
+				char *s;
+				size_t l;
+			} ident;
+		} handles;
+	} persistent;
+
 #ifdef ZEND_ENGINE_2
 	zend_bool only_exceptions;
 #endif
@@ -202,11 +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);
-#	endif
+PHP_FUNCTION(http_persistent_handles_ident);
+#ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);