- add http_support() for probing features that depend on external libraries

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 5d0491a19ff14ce1db779ee34e1591e7c92c3bdb..8930b67939e65efbdc47ae7331d92131a24c8425 100644 (file)
--- a/http.c
+++ b/http.c
@@ -30,6 +30,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_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #      include "php_http_request_api.h"
@@ -60,6 +61,9 @@
 #ifdef HTTP_HAVE_MHASH
 #      include <mhash.h>
 #endif
+#ifdef HTTP_HAVE_ZLIB
+#      include <zlib.h>
+#endif
 
 #include <ctype.h>
 
@@ -74,9 +78,10 @@ ZEND_GET_MODULE(http)
 zend_function_entry http_functions[] = {
        PHP_FE(http_test, NULL)
        PHP_FE(http_date, NULL)
-       PHP_FE(http_absolute_uri, NULL)
-       PHP_FE(http_negotiate_language, NULL)
-       PHP_FE(http_negotiate_charset, NULL)
+       PHP_FE(http_build_uri, NULL)
+       PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
+       PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
+       PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
        PHP_FE(http_redirect, NULL)
        PHP_FE(http_throttle, NULL)
        PHP_FE(http_send_status, NULL)
@@ -112,6 +117,15 @@ zend_function_entry http_functions[] = {
        PHP_FE(http_build_query, NULL)
 #endif
        PHP_FE(ob_etaghandler, NULL)
+#ifdef HTTP_HAVE_ZLIB
+       PHP_FE(http_gzencode, NULL)
+       PHP_FE(http_gzdecode, NULL)
+       PHP_FE(http_deflate, NULL)
+       PHP_FE(http_inflate, NULL)
+       PHP_FE(http_compress, NULL)
+       PHP_FE(http_uncompress, NULL)
+#endif
+       PHP_FE(http_support, NULL)
        
        EMPTY_FUNCTION_ENTRY
 };
@@ -263,10 +277,10 @@ PHP_MINIT_FUNCTION(http)
 
        REGISTER_INI_ENTRIES();
        
-       if (SUCCESS != http_cache_global_init()) {
-               return FAILURE;
-       }
-       if (SUCCESS != http_request_method_global_init()) {
+       if (    (SUCCESS != http_support_global_init())                 ||
+                       (SUCCESS != http_headers_global_init())                 ||
+                       (SUCCESS != http_cache_global_init())                   ||
+                       (SUCCESS != http_request_method_global_init())) {
                return FAILURE;
        }
 #ifdef HTTP_HAVE_CURL
@@ -344,6 +358,17 @@ PHP_MINFO_FUNCTION(http)
 #else
                php_info_print_table_row(2, "cURL HTTP Requests", "disabled");
 #endif
+#ifdef HTTP_HAVE_ZLIB
+               {
+                       char my_zlib_version[64] = {0};
+                       
+                       strlcat(my_zlib_version, "zlib/", 63);
+                       strlcat(my_zlib_version, zlibVersion(), 63);
+                       php_info_print_table_row(2, "zlib GZIP Encodings", my_zlib_version);
+               }
+#else
+               php_info_print_table_row(2, "zlib GZIP Encodings", "disabled");
+#endif
 #ifdef HTTP_HAVE_MHASH
                {
                        char mhash_info[32];