- fix chicken&egg problem with ZTS + persistent handles + global request datashare

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index c4e358d2fe2939501fcde5c8fad0b3cf4b3898ff..511230eaedef4ab1f63b7884db0b6f9f2eb65b2b 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -56,10 +56,6 @@ PHP_FUNCTION(http_date)
 }
 /* }}} */
 
-#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
-#      define php_url_parse_ex(u, l) php_url_parse(u)
-#endif
-
 /* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]])
        Build an URL. */
 PHP_FUNCTION(http_build_url)
@@ -813,20 +809,12 @@ PHP_FUNCTION(http_match_request_header)
 /* {{{ proto object http_persistent_handles_count() */
 PHP_FUNCTION(http_persistent_handles_count)
 {
-       char **names;
-       int *counts;
-       int i, n;
-       
        NO_ARGS;
        
-       if ((n = http_persistent_handle_statall(&names, &counts))) {
-               object_init(return_value);
-               for (i = 0; i < n; ++i) {
-                       add_property_long(return_value, names[i], counts[i]);
-                       efree(names[i]);
-               }
-               efree(names);
-               efree(counts);
+       object_init(return_value);
+       if (!http_persistent_handle_statall_ex(HASH_OF(return_value))) {
+               zval_dtor(return_value);
+               RETURN_NULL();
        }
 }
 /* }}} */