X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=caa5c0cff934197ee0cdf91e28a8dd88e8e825a3;hp=4ae657420b3b458aa86b49d444e4106998315cdf;hb=22bbc9d47c33e366c4fe7def52063a25d8aa0224;hpb=a3e4bb629d39d3168d1304009e198a848aa14a08

diff --git a/php_http.h b/php_http.h
index 4ae6574..caa5c0c 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.1.0"
+#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,6 +127,15 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 				void *entries;
 			} custom;
 		} methods;
+#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;
+			zend_bool connect;
+		} datashare;
+#endif
 	} request;
 
 #ifdef ZEND_ENGINE_2
@@ -131,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)
 
@@ -151,7 +165,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #	define HTTP_HAVE_SESSION
 #endif
 
-#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH) && defined(HTTP_HAVE_PHP_HASH_H))
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(HTTP_HAVE_PHP_HASH_H)
 #	define HTTP_HAVE_HASH
 #endif
 
@@ -159,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);
@@ -183,6 +196,7 @@ PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);
+PHP_FUNCTION(http_build_cookie);
 PHP_FUNCTION(http_parse_params);
 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);