X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=0118e6d1bb279a37733e994bbe592a4153c1c870;hp=e57263c0c075f4f4dd7f419d0d45d851f81356d8;hb=1df42dae0279a4d0f98b042bb389e90cbd197f6f;hpb=e5e656c7f4a22c11763c6519b899523734e93015

diff --git a/http.c b/http.c
index e57263c..0118e6d 100644
--- 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-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -243,7 +243,7 @@ PHP_INI_MH(http_update_allowed_methods)
 #ifdef HTTP_HAVE_PERSISTENT_HANDLES
 PHP_INI_MH(http_update_persistent_handle_ident)
 {
-	HTTP_G->persistent.handles.ident.h = zend_get_hash_value(new_value, HTTP_G->persistent.handles.ident.l = new_value_length+1);
+	HTTP_G->persistent.handles.ident.h = zend_hash_func(new_value, HTTP_G->persistent.handles.ident.l = new_value_length+1);
 	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 #endif
@@ -300,7 +300,9 @@ PHP_MINIT_FUNCTION(http)
 #ifdef HTTP_HAVE_CURL
 #	ifdef HTTP_HAVE_PERSISTENT_HANDLES
 			(SUCCESS != PHP_MINIT_CALL(http_persistent_handle)) ||
+#		ifdef ZEND_ENGINE_2
 			(SUCCESS != PHP_MINIT_CALL(http_request_pool)) ||
+#		endif
 #	endif
 			(SUCCESS != PHP_MINIT_CALL(http_request))	||
 #	ifdef ZEND_ENGINE_2
@@ -447,15 +449,26 @@ PHP_MINFO_FUNCTION(http)
 		{
 			phpstr s;
 			HashTable *ht;
-			HashPosition pos;
-			HashKey key = initHashKey(0);
-			zval **val;
+			HashPosition pos1, pos2;
+			HashKey key1 = initHashKey(0), key2 = initHashKey(0);
+			zval **val1, **val2;
 			
-			if ((ht = http_persistent_handle_statall())) {
+			if ((ht = http_persistent_handle_statall()) && zend_hash_num_elements(ht)) {
 				phpstr_init(&s);
 				
-				FOREACH_HASH_KEYVAL(pos, ht, key, val) {
-					phpstr_appendf(&s, "%s (%ld), ", key.str, Z_LVAL_PP(val));
+				FOREACH_HASH_KEYVAL(pos1, ht, key1, val1) {
+					phpstr_append(&s, key1.str, key1.len-1);
+					phpstr_appends(&s, " (");
+					if (zend_hash_num_elements(Z_ARRVAL_PP(val1))) {
+						FOREACH_KEYVAL(pos2, *val1, key2, val2) {
+							phpstr_append(&s, key2.str, key2.len-1);
+							phpstr_appendf(&s, ":%ld, ", Z_LVAL_PP(val2));
+						}
+						PHPSTR_LEN(&s) -= 2;
+					} else {
+						phpstr_appends(&s, "0");
+					}
+					phpstr_appends(&s, "), ");
 				}
 				zend_hash_destroy(ht);
 				FREE_HASHTABLE(ht);