- (non-)ZTS fixes

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 4e2a7c67bc5e0c2b49f418b354c39224af60e1b8..4bd31d74c03829dec7033abc49f8264a5c0b3b5d 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.0.0RC5-dev"
+#define PHP_EXT_HTTP_VERSION "1.3.0dev"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
@@ -26,16 +26,13 @@
 #endif
 
 #include "php.h"
+#include "missing.h"
 #include "php_http_std_defs.h"
 #include "phpstr/phpstr.h"
-#include "missing.h"
 
 #ifdef HTTP_WANT_SAPI
 #      if PHP_API_VERSION > 20041225
 #              define HTTP_HAVE_SAPI_RTIME
-#              define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
-#      else
-#              define HTTP_GET_REQUEST_TIME() HTTP_G->request_time
 #      endif
 #      include "SAPI.h"
 #endif
@@ -91,6 +88,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        struct _http_globals_log {
                char *cache;
                char *redirect;
+               char *not_found;
                char *allowed_methods;
                char *composite;
        } log;
@@ -112,9 +110,11 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                        long start_flags;
                        void *stream;
                } inflate;
+               zend_bool not_found_404;
        } send;
 
        struct _http_globals_request {
+               time_t time;
                struct _http_globals_request_methods {
                        char *allowed;
                        struct _http_globals_request_methods_custom {
@@ -123,11 +123,17 @@ 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;
 
-#ifndef HTTP_HAVE_SAPI_RTIME
-       time_t request_time;
-#endif
 #ifdef ZEND_ENGINE_2
        zend_bool only_exceptions;
 #endif
@@ -146,6 +152,22 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #      define HTTP_G (&http_globals)
 #endif
 
+#if defined(HAVE_ICONV) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV))
+#      define HTTP_HAVE_ICONV
+#endif
+
+#if defined(HAVE_PHP_SESSION) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_SESSION))
+#      define HTTP_HAVE_SESSION
+#endif
+
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(HTTP_HAVE_PHP_HASH_H)
+#      define HTTP_HAVE_HASH
+#endif
+
+#if defined(HAVE_SPL)
+#      define HTTP_HAVE_SPL
+#endif
+
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_build_url);
@@ -170,6 +192,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);