summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-10-05 12:25:52 +0200
committerNikita Popov <nikita.ppv@gmail.com>2017-10-05 12:26:19 +0200
commit0e8ccb179d436246fe41f9fcd25db0074093fb1d (patch)
tree043397039981f9ab0a41545039aea26b7b3726d4 /sapi/apache2handler
parente9426cf8161efb8d15082391b6483539a3fdab31 (diff)
parentd34c8fa802fede44f092e055f50f7fca12eeff3b (diff)
downloadphp-git-0e8ccb179d436246fe41f9fcd25db0074093fb1d.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'sapi/apache2handler')
-rw-r--r--sapi/apache2handler/apache_config.c4
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"));
}