X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=a3d6bd85688a4ab00bef18622ed670921308db4e;hp=e614f2236947b99f95b7082a417660732ef24526;hb=001d038560e304bef20f3b3cea063653a45e3a61;hpb=0eccfc06147e6b5559f871cd1a1332abf6a9b526

diff --git a/php_http.h b/php_http.h
index e614f22..a3d6bd8 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.3.0dev"
+#define PHP_EXT_HTTP_VERSION "1.5.0dev"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -71,6 +71,8 @@
 #endif
 
 #include <ctype.h>
+#define HTTP_IS_CTYPE(type, c) is##type((int) (unsigned char) (c))
+#define HTTP_TO_CTYPE(type, c) to##type((int) (unsigned char) (c))
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
@@ -100,6 +102,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 		char *unquoted_etag;
 		time_t last_modified;
 		struct _http_globals_send_deflate {
+			zend_bool response;
 			zend_bool start_auto;
 			long start_flags;
 			int encoding;
@@ -115,6 +118,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 
 	struct _http_globals_request {
 		time_t time;
+		HashTable *headers;
 		struct _http_globals_request_methods {
 			char *allowed;
 			struct _http_globals_request_methods_custom {
@@ -123,8 +127,9 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 				void *entries;
 			} custom;
 		} methods;
-#ifdef ZEND_ENGINE_2
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 		struct _http_globals_request_datashare {
+			zend_llist handles;
 			zend_bool cookie;
 			zend_bool dns;
 			zend_bool ssl;
@@ -139,6 +144,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 
 	zend_bool force_exit;
 	zend_bool read_post_data;
+	zval *server_var;
 
 ZEND_END_MODULE_GLOBALS(http)
 
@@ -167,7 +173,6 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #	define HTTP_HAVE_SPL
 #endif
 
-PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_build_url);
 PHP_FUNCTION(http_build_str);
@@ -198,6 +203,10 @@ 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_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);