X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=efd34184e0b8ea5ed02f427d0737c0dc22195889;hp=e3ee6ab69aced0bf96635c70eece58b780ba41a2;hb=8191c55421fb6ecc86185608a8b0510da1525e1e;hpb=eebe0f3e8947ecb407451d20aef0611cfcedfdac

diff --git a/php_http.c b/php_http.c
index e3ee6ab..efd3418 100644
--- a/php_http.c
+++ b/php_http.c
@@ -44,6 +44,7 @@ PHP_RSHUTDOWN_FUNCTION(http);
 PHP_MINFO_FUNCTION(http);
 
 static zend_module_dep http_module_deps[] = {
+	ZEND_MOD_REQUIRED("raphf")
 	ZEND_MOD_REQUIRED("spl")
 #ifdef PHP_HTTP_HAVE_HASH
 	ZEND_MOD_REQUIRED("hash")
@@ -51,6 +52,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 +78,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 +126,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,19 +134,18 @@ 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)
 PHP_INI_END()
 
 PHP_MINIT_FUNCTION(http)
@@ -128,17 +154,17 @@ 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)
-	|| SUCCESS != PHP_MINIT_CALL(http_persistent_handle)
 	|| SUCCESS != PHP_MINIT_CALL(http_cookie)
 	|| SUCCESS != PHP_MINIT_CALL(http_encoding)
 	|| SUCCESS != PHP_MINIT_CALL(http_filter)
 	|| SUCCESS != PHP_MINIT_CALL(http_header)
 	|| SUCCESS != PHP_MINIT_CALL(http_message)
 	|| SUCCESS != PHP_MINIT_CALL(http_message_body)
-	|| SUCCESS != PHP_MINIT_CALL(http_property_proxy)
 	|| SUCCESS != PHP_MINIT_CALL(http_querystring)
 	|| SUCCESS != PHP_MINIT_CALL(http_client_interface)
 	|| SUCCESS != PHP_MINIT_CALL(http_client)
@@ -149,10 +175,10 @@ PHP_MINIT_FUNCTION(http)
 	|| SUCCESS != PHP_MINIT_CALL(http_client_factory)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MINIT_CALL(http_curl)
-#endif
 	|| 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_url)
 	|| SUCCESS != PHP_MINIT_CALL(http_env)
 	|| SUCCESS != PHP_MINIT_CALL(http_env_request)
@@ -174,14 +200,16 @@ 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;
 }
 
@@ -202,6 +230,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;
@@ -212,6 +243,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);
@@ -230,7 +266,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
@@ -238,11 +280,12 @@ 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");
@@ -250,43 +293,33 @@ PHP_MINFO_FUNCTION(http)
 	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");
-	{
-		HashTable *ht;
-		HashPosition pos1, pos2;
-		php_http_array_hashkey_t provider = php_http_array_hashkey_init(0), ident = php_http_array_hashkey_init(0);
-		zval **val, **sub, **zused, **zfree;
-		
-		if ((ht = php_http_persistent_handle_statall(NULL TSRMLS_CC)) && zend_hash_num_elements(ht)) {
-			FOREACH_HASH_KEYVAL(pos1, ht, provider, val) {
-				if (zend_hash_num_elements(Z_ARRVAL_PP(val))) {
-					FOREACH_KEYVAL(pos2, *val, ident, sub) {
-						if (	SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("used"), (void *) &zused) &&
-								SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("free"), (void *) &zfree)) {
-							zval *used = php_http_ztyp(IS_STRING, *zused);
-							zval *free = php_http_ztyp(IS_STRING, *zfree);
-							php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_P(used), Z_STRVAL_P(free));
-							zval_ptr_dtor(&used);
-							zval_ptr_dtor(&free);
-						} else {
-							php_info_print_table_row(4, provider.str, ident.str, "0", "0");
-						}
-					}
-				} else {
-					php_info_print_table_row(4, provider.str, "N/A", "0", "0");
-				}
-			}
-		} else {
-			php_info_print_table_row(4, "N/A", "N/A", "0", "0");
-		}
-		if (ht) {
-			zend_hash_destroy(ht);
-			FREE_HASHTABLE(ht);
+	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_dtor(&buf);
+
+	php_info_print_table_row(2, "Stream Filters",  "http.chunked_encode, http.chunked_decode, http.inflate, http.deflate");
 	php_info_print_table_end();
-	
+
+
 	DISPLAY_INI_ENTRIES();
 }