Fixed php_info related

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 682af53798a077610f0366578fb6d39e10fd9e0c..eba23a89c585d9abf8232dad74345512e3b59e60 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -170,8 +170,9 @@ PHPAPI void php_info_print_module(zend_module_entry *zend_module TSRMLS_DC) /* {
 }
 /* }}} */
 
-static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /* {{{ */
+static int _display_module_info_func(zval *el TSRMLS_DC) /* {{{ */
 {
+       zend_module_entry *module = (zend_module_entry*)Z_PTR_P(el);
        if (module->info_func || module->version) {
                php_info_print_module(module TSRMLS_CC);
        }
@@ -179,8 +180,9 @@ static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /* {{{
 }
 /* }}} */
 
-static int _display_module_info_def(zend_module_entry *module TSRMLS_DC) /* {{{ */
+static int _display_module_info_def(zval *el TSRMLS_DC) /* {{{ */
 {
+       zend_module_entry *module = (zend_module_entry*)Z_PTR_P(el);
        if (!module->info_func && !module->version) {
                php_info_print_module(module TSRMLS_CC);
        }
@@ -268,6 +270,7 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC)
                        zend_hash_move_forward(Z_ARRVAL_P(data));
                }
        }
+       STR_FREE(key);
 }
 /* }}} */
 
@@ -828,12 +831,12 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
                zend_hash_copy(&sorted_registry, &module_registry, NULL);
                zend_hash_sort(&sorted_registry, zend_qsort, module_name_cmp, 0 TSRMLS_CC);
 
-               zend_hash_apply(&sorted_registry, (apply_func_t) _display_module_info_func TSRMLS_CC);
+               zend_hash_apply(&sorted_registry, _display_module_info_func TSRMLS_CC);
 
                SECTION("Additional Modules");
                php_info_print_table_start();
                php_info_print_table_header(1, "Module Name");
-               zend_hash_apply(&sorted_registry, (apply_func_t) _display_module_info_def TSRMLS_CC);
+               zend_hash_apply(&sorted_registry, _display_module_info_def TSRMLS_CC);
                php_info_print_table_end();
 
                zend_hash_destroy(&sorted_registry);

diff --git a/main/php_ini.c b/main/php_ini.c
index 0c2ccc958f8506483a624fb13c77a4bf977c409c..5fd5bfc8524b165929f57ce6fa243225d3b7c227 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -121,22 +121,25 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type TSRMLS_DC)
 
 /* {{{ php_ini_displayer
  */
-static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number TSRMLS_DC)
+static int php_ini_displayer(zval *el, void *arg TSRMLS_DC)
 {
+       zend_ini_entry *ini_entry = (zend_ini_entry*)Z_PTR_P(el);
+       int module_number = *(int *)arg;
+
        if (ini_entry->module_number != module_number) {
                return 0;
        }
        if (!sapi_module.phpinfo_as_text) {
                PUTS("<tr>");
                PUTS("<td class=\"e\">");
-               PHPWRITE(ini_entry->name, ini_entry->name_length - 1);
+               PHPWRITE(ini_entry->name, ini_entry->name_length);
                PUTS("</td><td class=\"v\">");
                php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE TSRMLS_CC);
                PUTS("</td><td class=\"v\">");
                php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG TSRMLS_CC);
                PUTS("</td></tr>\n");
        } else {
-               PHPWRITE(ini_entry->name, ini_entry->name_length - 1);
+               PHPWRITE(ini_entry->name, ini_entry->name_length);
                PUTS(" => ");
                php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE TSRMLS_CC);
                PUTS(" => ");
@@ -149,10 +152,12 @@ static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number TSRMLS
 
 /* {{{ php_ini_available
  */
-static int php_ini_available(zend_ini_entry *ini_entry, int *module_number_available TSRMLS_DC)
+static int php_ini_available(zval *el, void *arg TSRMLS_DC)
 {
-       if (ini_entry->module_number == *module_number_available) {
-               *module_number_available = -1;
+       zend_ini_entry *ini_entry = (zend_ini_entry *)Z_PTR_P(el);
+       int *module_number_available = (int *)arg;
+       if (ini_entry->module_number == *(int *)module_number_available) {
+               *(int *)module_number_available = -1;
                return ZEND_HASH_APPLY_STOP;
        } else {
                return ZEND_HASH_APPLY_KEEP;
@@ -173,11 +178,11 @@ PHPAPI void display_ini_entries(zend_module_entry *module)
                module_number = 0;
        }
        module_number_available = module_number;
-       zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t) php_ini_available, &module_number_available TSRMLS_CC);
+       zend_hash_apply_with_argument(EG(ini_directives), php_ini_available, &module_number_available TSRMLS_CC);
        if (module_number_available == -1) {
                php_info_print_table_start();
                php_info_print_table_header(3, "Directive", "Local Value", "Master Value");
-               zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (zend_intptr_t) module_number TSRMLS_CC);
+               zend_hash_apply_with_argument(EG(ini_directives), php_ini_displayer, (void *)&module_number TSRMLS_CC);
                php_info_print_table_end();
        }
 }
@@ -350,7 +355,6 @@ static void php_load_php_extension_cb(void *arg TSRMLS_DC)
 static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
 {
        char *filename = *((char **) arg);
-       int length = strlen(filename);
 
        if (IS_ABSOLUTE_PATH(filename, length)) {
                zend_load_extension(filename TSRMLS_CC);