diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-10-05 12:25:20 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-10-05 12:25:37 +0200 |
| commit | d34c8fa802fede44f092e055f50f7fca12eeff3b (patch) | |
| tree | 642c2af2aae5be521fa656ff59e6a0cfb9238abb | |
| parent | b6e34eaf04c5fc692f7c1aff77647f4961c99748 (diff) | |
| parent | 6b9ccda936bb863f9c9830f0aebef672a405a786 (diff) | |
| download | php-git-d34c8fa802fede44f092e055f50f7fca12eeff3b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/apache_config.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -13,6 +13,10 @@ PHP NEWS . Fixed bug #75290 (debug info of Closures of internal functions contain garbage argument names). (Andrea) +- Apache2Handler: + . Fixed bug #75311 (error: 'zend_hash_key' has no member named 'arKey' in + apache2handler). (mcarbonneaux) + - Hash: . Fixed bug #75303 (sha3 hangs on bigendian). (Remi) 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")); } |