X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=b0b04d8f82e047085f1915fdb309745b8501f2e5;hp=923748d1cba7ef1571ba2f0600173ead4e1296e9;hb=f05241af52786a2164a2a298492b80b270d9c596;hpb=6c4a552c1ad7b0018afb57a3d0028c2be166a30a diff --git a/http.c b/http.c index 923748d..b0b04d8 100644 --- a/http.c +++ b/http.c @@ -164,7 +164,7 @@ zend_module_entry http_module_entry = { PHP_RINIT(http), PHP_RSHUTDOWN(http), PHP_MINFO(http), - PHP_EXT_HTTP_VERSION, + PHP_HTTP_VERSION, STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -411,8 +411,8 @@ PHP_MINFO_FUNCTION(http) { php_info_print_table_start(); { - php_info_print_table_row(2, "HTTP Support", "enabled"); - php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION); + php_info_print_table_header(2, "HTTP Support", "enabled"); + php_info_print_table_row(2, "Extension Version", PHP_HTTP_VERSION); php_info_print_table_row(2, "Registered Classes", #ifndef ZEND_ENGINE_2 "none" @@ -487,9 +487,11 @@ PHP_MINFO_FUNCTION(http) 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)) { - convert_to_string(*zused); - convert_to_string(*zfree); - php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_PP(zused), Z_STRVAL_PP(zfree)); + zval *used = http_zsep(IS_STRING, *zused); + zval *free = http_zsep(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"); }