- enable zlib by default

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index d22499c4a8d3dd35d68b00f2c12c53fdcf86e0bb..05244d18287a8080193a4e7d598bcdc87ae13cd3 100644 (file)
--- a/http.c
+++ b/http.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -29,7 +29,7 @@
 #include "php_http_api.h"
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_headers_api.h"
+#include "php_http_send_api.h"
 #include "php_http_message_api.h"
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
@@ -129,6 +129,9 @@ static zend_module_dep http_module_dep[] = {
 #      endif
 #      ifdef HTTP_HAVE_EXT_HASH
        ZEND_MOD_REQUIRED("hash")
+#      endif
+#      ifdef HAVE_PHP_SESSION
+       ZEND_MOD_REQUIRED("session")
 #      endif
        {NULL, NULL, NULL, 0}
 };
@@ -232,7 +235,7 @@ PHP_MINIT_FUNCTION(http)
        REGISTER_INI_ENTRIES();
        
        if (    (SUCCESS != PHP_MINIT_CALL(http_support))       ||
-                       (SUCCESS != PHP_MINIT_CALL(http_headers))       ||
+                       (SUCCESS != PHP_MINIT_CALL(http_send))          ||
 #ifdef HTTP_HAVE_CURL
                        (SUCCESS != PHP_MINIT_CALL(http_request))       ||
 #endif /* HTTP_HAVE_CURL */
@@ -342,6 +345,14 @@ PHP_MINFO_FUNCTION(http)
 #      ifndef WONKY
                        "HttpResponse"
 #      endif
+#endif
+               );
+               php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler");
+               php_info_print_table_row(2, "Stream Filters", 
+#ifndef ZEND_ENGINE_2
+                       "none"
+#else
+                       "http.chunked_decode, http.chunked_encode, http.deflate, http.inflate"
 #endif
                );
        }
@@ -374,17 +385,13 @@ PHP_MINFO_FUNCTION(http)
        {
                int i;
                getGlobals(G);
-               struct _entry {char *name; char *cnst;} *entry;
-               phpstr *known_request_methods = phpstr_new();
                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;
 
-               for (i = HTTP_MIN_REQUEST_METHOD; i < HTTP_MAX_REQUEST_METHOD; ++i) {
-                       phpstr_appendl(known_request_methods, http_request_method_name(i));
-                       phpstr_appends(known_request_methods, ", ");
-               }
                for (i = 0; i < G->request.methods.custom.count; ++i) {
-                       if ((entry = ((struct _entry **) G->request.methods.custom.entries)[i])) {
-                               phpstr_appendf(custom_request_methods, "%s, ", entry->name);
+                       if (ptr[i]) {
+                               phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name);
                        }
                }
 
@@ -395,7 +402,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(HTTP_G(request).methods.allowed) ? HTTP_G(request).methods.allowed : "(ANY)");
+               php_info_print_table_row(2, "Allowed", strlen(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)");
                
                phpstr_free(&known_request_methods);
                phpstr_free(&custom_request_methods);