com php-src: Fixed bug #75311: NEWS sapi/apache2handler/apach e_config.c

Commit: 6b9ccda936bb863f9c9830f0aebef672a405a786 Author: Mathieu CARBONNEAUX <mcarbonneaux@gmail.com> Thu, 5 Oct 2017 01:34:20 +0200 Committer: Nikita Popov <nikita.ppv@gmail.com> Thu, 5 Oct 2017 12:24:57 +0200 Parents: 1195de87ffa018abe4b1461b2b254fe6eee963cc Branches: PHP-7.0 PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b9ccda936bb863f9c9830f0aebef672a405a786 Log: Fixed bug #75311 Bugs: https://bugs.php.net/75311 Changed paths: M NEWS M sapi/apache2handler/apache_config.c Diff: diff --git a/NEWS b/NEWS index 5154345..b68ad96 100644 --- a/NEWS +++ b/NEWS @@ -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) + - OCI8: . Fixed incorrect reference counting. (Dmitry, Tianfang Yang) diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index 93d0ec3..4ac45fc 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")); }