- 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 528f8bad300a77dac1dfaaaa6c5fbf19abc835fe..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
 };
@@ -205,6 +219,10 @@ PHP_INI_DISP(http_etag_mode_displayer)
        
        switch (value)
        {
+               case HTTP_ETAG_CRC32:
+                       ZEND_WRITE("HTTP_ETAG_CRC32", lenof("HTTP_ETAG_CRC32"));
+               break;
+               
                case HTTP_ETAG_SHA1:
                        ZEND_WRITE("HTTP_ETAG_SHA1", lenof("HTTP_ETAG_SHA1"));
                break;
@@ -259,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
@@ -333,29 +351,40 @@ PHP_MINFO_FUNCTION(http)
 {
        php_info_print_table_start();
        {
-               php_info_print_table_row(2, "Extended HTTP support:", "enabled");
-               php_info_print_table_row(2, "Extension Version:", HTTP_PEXT_VERSION);
+               php_info_print_table_row(2, "Extended HTTP support", "enabled");
+               php_info_print_table_row(2, "Extension Version", HTTP_PEXT_VERSION);
 #ifdef HTTP_HAVE_CURL
-               php_info_print_table_row(2, "cURL HTTP Requests:", curl_version());
+               php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
 #else
-               php_info_print_table_row(2, "cURL HTTP Requests:", "disabled");
+               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];
                        
                        snprintf(mhash_info, 32, "libmhash/%d", MHASH_API_VERSION);
-                       php_info_print_table_row(2, "mhash ETag Generator:", mhash_info);
+                       php_info_print_table_row(2, "mhash ETag Generator", mhash_info);
                }
 #else
-               php_info_print_table_row(2, "mhash ETag Generator:", "disabled");
+               php_info_print_table_row(2, "mhash ETag Generator", "disabled");
 #endif
 #if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
-               php_info_print_table_row(2, "magic MIME Guessing:", "libmagic/unknown");
+               php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
 #else
-               php_info_print_table_row(2, "magic MIME Guessing:", "disabled");
+               php_info_print_table_row(2, "magic MIME Guessing", "disabled");
 #endif
-               php_info_print_table_row(2, "Registered Classes:",
+               php_info_print_table_row(2, "Registered Classes",
 #ifndef ZEND_ENGINE_2
                        "none"
 #else
@@ -372,8 +401,36 @@ PHP_MINFO_FUNCTION(http)
                );
        }
        php_info_print_table_end();
+       
+       php_info_print_table_start();
+       php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms");
+       {
+                       
+               php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1");
+#ifdef HTTP_HAVE_MHASH
+               {
+                       phpstr *algos = phpstr_new();
+                       int i, c = mhash_count();
+                       
+                       for (i = 0; i <= c; ++i) {
+                               const char *hash = mhash_get_hash_name_static(i);
+                               
+                               if (hash) {
+                                       phpstr_appendf(algos, "%s, ", hash);
+                               }
+                       }
+                       phpstr_fix(algos);
+                       php_info_print_table_row(2, "MHASH", PHPSTR_VAL(algos));
+                       phpstr_free(&algos);
+               }
+#else
+               php_info_print_table_row(2, "MHASH", "not available");
+#endif
+       }
+       php_info_print_table_end();
 
        php_info_print_table_start();
+       php_info_print_table_colspan_header(2, "Request Methods");
        {
                unsigned i;
                zval **custom_method;
@@ -393,10 +450,11 @@ PHP_MINFO_FUNCTION(http)
                phpstr_fix(known_request_methods);
                phpstr_fix(custom_request_methods);
 
-               php_info_print_table_row(2, "Known Request Methods:", PHPSTR_VAL(known_request_methods));
-               php_info_print_table_row(2, "Custom Request Methods:",
+               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)");
+               
                phpstr_free(&known_request_methods);
                phpstr_free(&custom_request_methods);
        }