X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=5dffb53f79645f19cb1ab46eb1c36a3a1aa9e9a7;hp=005498b35bdf28adb0f44a8ded6bb7af9f96f4ec;hb=ea76053f1595a10c79735e36a51f54478ff15acf;hpb=6a8d8f34361e89ea6e9b7b2737f0a8baf94705f2

diff --git a/php_http.h b/php_http.h
index 005498b..5dffb53 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.0RC1"
+#define PHP_EXT_HTTP_VERSION "1.6.0dev"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -57,6 +57,10 @@
 #	endif
 #	include <curl/curl.h>
 #	define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
+#
+#	if defined(HTTP_WANT_EVENT) && defined(HTTP_HAVE_EVENT)
+#		include <event.h>
+#	endif
 #endif
 
 #if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
@@ -120,12 +124,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 {
@@ -135,12 +136,19 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 			zend_bool ssl;
 			zend_bool connect;
 		} datashare;
+#endif
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_EVENT)
+		struct _http_globals_request_pool {
+			struct _http_globals_request_pool_event {
+				void *base;
+			} event;
+		} pool;
 #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 +156,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 			} ident;
 		} handles;
 	} persistent;
-#endif
+
 #ifdef ZEND_ENGINE_2
 	zend_bool only_exceptions;
 #endif
@@ -213,12 +221,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);