From: Mathieu CARBONNEAUX <mcarbonneaux@gmail.com>
Date: Wed, 4 Oct 2017 23:34:20 +0000 (+0200)
Subject: Fixed bug #75311
X-Git-Tag: php-7.0.25RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b9ccda936bb863f9c9830f0aebef672a405a786;p=php

Fixed bug #75311
---

diff --git a/NEWS b/NEWS
index 5154345aef..b68ad96388 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 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"));
 		}