remove superfluous buffer macros

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index f4b7394ce3591f7920df53c0da4e8d9e892f525c..86933eaf02e9a455f15485111865009391dc84b5 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -51,6 +51,9 @@ static zend_module_dep http_module_deps[] = {
 #ifdef PHP_HTTP_HAVE_ICONV
        ZEND_MOD_REQUIRED("iconv")
 #endif
+#ifdef PHP_HTTP_HAVE_JSON
+       ZEND_MOD_REQUIRED("json")
+#endif
 #ifdef PHP_HTTP_HAVE_EVENT
        ZEND_MOD_CONFLICTS("event")
 #endif
@@ -74,7 +77,29 @@ zend_module_entry http_module_entry = {
 
 int http_module_number;
 
-#if PHP_DEBUG
+static HashTable http_module_classes;
+void php_http_register_class(zend_class_entry *(*get_ce)(void))
+{
+       zend_hash_next_index_insert(&http_module_classes, &get_ce, sizeof(get_ce), NULL);
+}
+static void php_http_registered_classes(php_http_buffer_t *buf, unsigned flags)
+{
+       HashPosition pos;
+       zend_class_entry *(**get_ce)(void);
+
+       FOREACH_HASH_VAL(pos, &http_module_classes, get_ce) {
+               zend_class_entry *ce = (*get_ce)();
+               if ((flags && (ce->ce_flags & flags)) || (!flags && !(ce->ce_flags & 0x0fff))) {
+                       if (buf->used) {
+                               php_http_buffer_appends(buf, ", ");
+                       }
+                       php_http_buffer_append(buf, ce->name, ce->name_length);
+               }
+       }
+       php_http_buffer_fix(buf);
+}
+
+#if PHP_DEBUG && !HAVE_GCOV
 void _dpf(int type, const char *data, size_t length)
 {
        static const char _sym[] = "><><><";
@@ -100,6 +125,7 @@ static void php_http_globals_init_once(zend_php_http_globals *G)
        memset(G, 0, sizeof(*G));
 }
 
+#if 0
 static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC)
 {
 }
@@ -107,16 +133,16 @@ static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC)
 static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
 {
 }
+#endif
 
-#if defined(ZTS) && defined(PHP_DEBUG)
-#if ZTS && PHP_DEBUG
+#if ZTS && PHP_DEBUG && !HAVE_GCOV
 zend_php_http_globals *php_http_globals(void)
 {
        TSRMLS_FETCH();
        return PHP_HTTP_G;
 }
 #endif
-#endif
+
 PHP_INI_BEGIN()
        PHP_HTTP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode)
        PHP_HTTP_INI_ENTRY("http.persistent_handle.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent_handle.limit)
@@ -128,6 +154,8 @@ PHP_MINIT_FUNCTION(http)
        ZEND_INIT_MODULE_GLOBALS(php_http, php_http_globals_init_once, NULL);
        REGISTER_INI_ENTRIES();
        
+       zend_hash_init(&http_module_classes, 0, NULL, NULL, 1);
+
        if (0
        || SUCCESS != PHP_MINIT_CALL(http_object)
        || SUCCESS != PHP_MINIT_CALL(http_exception)
@@ -146,12 +174,13 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_client_response)
        || SUCCESS != PHP_MINIT_CALL(http_client_datashare)
        || SUCCESS != PHP_MINIT_CALL(http_client_pool)
+       || SUCCESS != PHP_MINIT_CALL(http_client_factory)
 #if PHP_HTTP_HAVE_CURL
        || SUCCESS != PHP_MINIT_CALL(http_curl)
+       || SUCCESS != PHP_MINIT_CALL(http_curl_client)
+       || SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
+       || SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
 #endif
-       || SUCCESS != PHP_MINIT_CALL(http_client_curl)
-       || SUCCESS != PHP_MINIT_CALL(http_client_pool_curl)
-       || SUCCESS != PHP_MINIT_CALL(http_client_datashare_curl)
        || SUCCESS != PHP_MINIT_CALL(http_url)
        || SUCCESS != PHP_MINIT_CALL(http_env)
        || SUCCESS != PHP_MINIT_CALL(http_env_request)
@@ -173,13 +202,17 @@ PHP_MSHUTDOWN_FUNCTION(http)
        if (0
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
 #if PHP_HTTP_HAVE_CURL
+       || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl_client)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
 #endif
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+       || SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
        ) {
                return FAILURE;
        }
        
+       zend_hash_destroy(&http_module_classes);
+
        return SUCCESS;
 }
 
@@ -188,7 +221,7 @@ PHP_RINIT_FUNCTION(http)
        if (0
        || SUCCESS != PHP_RINIT_CALL(http_env)
 #if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-       || SUCCESS != PHP_RINIT_CALL(http_client_pool_curl)
+       || SUCCESS != PHP_RINIT_CALL(http_curl_client_pool)
 #endif
        ) {
                return FAILURE;
@@ -200,6 +233,9 @@ PHP_RINIT_FUNCTION(http)
 PHP_RSHUTDOWN_FUNCTION(http)
 {
        if (0
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+       || SUCCESS != PHP_RSHUTDOWN_CALL(http_curl_client_pool)
+#endif
        || SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
        ) {
                return FAILURE;
@@ -210,6 +246,11 @@ PHP_RSHUTDOWN_FUNCTION(http)
 
 PHP_MINFO_FUNCTION(http)
 {
+       unsigned i;
+       php_http_buffer_t buf;
+
+       php_http_buffer_init(&buf);
+
        php_info_print_table_start();
        php_info_print_table_header(2, "HTTP Support", "enabled");
        php_info_print_table_row(2, "Extension Version", PHP_HTTP_EXT_VERSION);
@@ -228,7 +269,13 @@ PHP_MINFO_FUNCTION(http)
 #endif
 
 #if PHP_HTTP_HAVE_EVENT
-       php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());
+       php_info_print_table_row(3, "libevent",
+#      ifdef LIBEVENT_VERSION
+                       LIBEVENT_VERSION,
+#      else
+                       PHP_HTTP_EVENT_VERSION,
+#      endif
+                       event_get_version());
 #else
        php_info_print_table_row(3, "libevent", "disabled", "disabled");
 #endif
@@ -236,17 +283,45 @@ PHP_MINFO_FUNCTION(http)
 #if PHP_HTTP_HAVE_SERF
        {
                int v[3];
-               char sl_v[16] = {0};
 
                serf_lib_version(&v[0], &v[1], &v[2]);
-               slprintf(sl_v, lenof(sl_v), "%d.%d.%d", v[0], v[1], v[2]);
-               php_info_print_table_row(3, "libserf", SERF_VERSION_STRING, sl_v);
+               php_http_buffer_appendf(&buf, "%d.%d.%d", v[0], v[1], v[2]);
+               php_http_buffer_fix(&buf);
+               php_info_print_table_row(3, "libserf", SERF_VERSION_STRING, buf.data);
+               php_http_buffer_reset(&buf);
        }
 #else
        php_info_print_table_row(3, "libserf", "disabled", "disabled");
 #endif
        php_info_print_table_end();
        
+       php_info_print_table_start();
+       php_info_print_table_colspan_header(2, "Registered API");
+       for (i = 0; http_functions[i].fname; ++i) {
+               if (buf.used) {
+                       php_http_buffer_appends(&buf, ", ");
+               }
+               php_http_buffer_appendl(&buf, http_functions[i].fname);
+       }
+       php_http_buffer_fix(&buf);
+       php_info_print_table_row(2, "Functions", buf.data);
+       php_http_buffer_reset(&buf);
+       php_http_registered_classes(&buf, ZEND_ACC_INTERFACE);
+       php_info_print_table_row(2, "Interfaces", buf.data);
+       php_http_buffer_reset(&buf);
+       php_http_registered_classes(&buf, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
+       php_info_print_table_row(2, "Abstract Classes", buf.data);
+       php_http_buffer_reset(&buf);
+       php_http_registered_classes(&buf, 0);
+       php_info_print_table_row(2, "Implemented Classes", buf.data);
+       php_http_buffer_reset(&buf);
+       php_http_registered_classes(&buf, ZEND_ACC_FINAL_CLASS);
+       php_info_print_table_row(2, "Final Classes", buf.data);
+       php_http_buffer_reset(&buf);
+
+       php_info_print_table_row(2, "Stream Filters",  "http.chunked_encode, http.chunked_decode, http.inflate, http.deflate");
+       php_info_print_table_end();
+
        php_info_print_table_start();
        php_info_print_table_colspan_header(4, "Persistent Handles");
        php_info_print_table_header(4, "Provider", "Ident", "Used", "Free");
@@ -285,6 +360,8 @@ PHP_MINFO_FUNCTION(http)
        }
        php_info_print_table_end();
        
+       php_http_buffer_dtor(&buf);
+
        DISPLAY_INI_ENTRIES();
 }