diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-10-05 12:26:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-10-05 12:26:32 +0200 |
| commit | 47a86687e812115a556f9e5e732d6e4675927246 (patch) | |
| tree | 1bb751eb130b8d4090a574d554f2c271ad8b3621 /sapi | |
| parent | 0b87d4bf294ccb4f27e09fccf2c412a4e7b15819 (diff) | |
| parent | 0e8ccb179d436246fe41f9fcd25db0074093fb1d (diff) | |
| download | php-git-47a86687e812115a556f9e5e732d6e4675927246.tar.gz | |
Merge branch 'PHP-7.2'
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2handler/apache_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index 93d0ec3d97..4ac45fc958 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -128,7 +128,7 @@ static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, zval *zv, if (new_per_dir_entry->status >= orig_per_dir_entry->status) { /* use new entry */ - phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", hash_key->arKey, new_per_dir_entry->status, orig_per_dir_entry->status)); + phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", ZSTR_VAL(hash_key->key), new_per_dir_entry->status, orig_per_dir_entry->status)); return 1; } else { return 0; @@ -176,7 +176,7 @@ void apply_config(void *dummy) php_dir_entry *data; ZEND_HASH_FOREACH_STR_KEY_PTR(&d->config, str, data) { - phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value)); + phpapdebug((stderr, "APPLYING (%s)(%s)\n", ZSTR_VAL(str), data->value)); if (zend_alter_ini_entry_chars(str, data->value, data->value_len, data->status, data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) { phpapdebug((stderr, "..FAILED\n")); } |