- fix chicken&egg problem with ZTS + persistent handles + global request datashare

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 0fa16719c19daab79bfdc6b84e2a9b880366d36c..a3d6bd85688a4ab00bef18622ed670921308db4e 100644 (file)
--- 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.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 {
@@ -140,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)
 
@@ -168,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);
@@ -199,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);