- add bool must_revalidate param to HttpResponse::setCacheControl()

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index bbbb03aa99b20d95bbf32791b357f417c896f6ac..9b15c6c012e478cd43badacb203cdffc2ac734b4 100644 (file)
--- a/http.c
+++ b/http.c
@@ -24,6 +24,7 @@
 
 #include "php_http_api.h"
 #include "php_http_send_api.h"
+#include "php_http_cookie_api.h"
 #include "php_http_cache_api.h"
 #include "php_http_send_api.h"
 #include "php_http_message_api.h"
@@ -34,6 +35,7 @@
 #ifdef HTTP_HAVE_ZLIB
 #      include "php_http_encoding_api.h"
 #endif
+#include "php_http_url_api.h"
 
 #ifdef ZEND_ENGINE_2
 #      include "php_http_filter_api.h"
@@ -238,6 +240,7 @@ PHP_MINIT_FUNCTION(http)
        REGISTER_INI_ENTRIES();
        
        if (    (SUCCESS != PHP_MINIT_CALL(http_support))       ||
+                       (SUCCESS != PHP_MINIT_CALL(http_cookie))        ||
                        (SUCCESS != PHP_MINIT_CALL(http_send))          ||
                        (SUCCESS != PHP_MINIT_CALL(http_url))           ||
 #ifdef HTTP_HAVE_CURL
@@ -289,11 +292,11 @@ PHP_MSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_RINIT_FUNCTION */
 PHP_RINIT_FUNCTION(http)
 {
-       http_globals_init(HTTP_GLOBALS);
+       http_globals_init(HTTP_G);
 
-       if (HTTP_G(request).methods.allowed) {
-               http_check_allowed_methods(HTTP_G(request).methods.allowed, 
-                       strlen(HTTP_G(request).methods.allowed));
+       if (HTTP_G->request.methods.allowed) {
+               http_check_allowed_methods(HTTP_G->request.methods.allowed, 
+                       strlen(HTTP_G->request.methods.allowed));
        }
 
        if (    (SUCCESS != PHP_RINIT_CALL(http_request_method))
@@ -321,7 +324,7 @@ PHP_RSHUTDOWN_FUNCTION(http)
                status = FAILURE;
        }
        
-       http_globals_free(HTTP_GLOBALS);
+       http_globals_free(HTTP_G);
        return status;
 }
 /* }}} */
@@ -348,8 +351,9 @@ PHP_MINFO_FUNCTION(http)
                        "HttpInflateStream, "
 #      endif
 #      ifndef WONKY
-                       "HttpResponse"
+                       "HttpResponse, "
 #      endif
+                       "HttpQueryString"
 #endif
                );
                php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler");
@@ -389,12 +393,11 @@ PHP_MINFO_FUNCTION(http)
        php_info_print_table_colspan_header(2, "Request Methods");
        {
                int i;
-               getGlobals(G);
                phpstr *custom_request_methods = phpstr_new();
                phpstr *known_request_methods = phpstr_from_string(HTTP_KNOWN_METHODS, lenof(HTTP_KNOWN_METHODS));
-               http_request_method_entry **ptr = G->request.methods.custom.entries;
+               http_request_method_entry **ptr = HTTP_G->request.methods.custom.entries;
 
-               for (i = 0; i < G->request.methods.custom.count; ++i) {
+               for (i = 0; i < HTTP_G->request.methods.custom.count; ++i) {
                        if (ptr[i]) {
                                phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name);
                        }
@@ -407,7 +410,7 @@ PHP_MINFO_FUNCTION(http)
                php_info_print_table_row(2, "Known", PHPSTR_VAL(known_request_methods));
                php_info_print_table_row(2, "Custom",
                        PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
-               php_info_print_table_row(2, "Allowed", strlen(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)");
+               php_info_print_table_row(2, "Allowed", strlen(HTTP_G->request.methods.allowed) ? HTTP_G->request.methods.allowed : "(ANY)");
                
                phpstr_free(&known_request_methods);
                phpstr_free(&custom_request_methods);