From: Jani Taskinen <jani@php.net>
Date: Sat, 16 Jan 2010 21:01:12 +0000 (+0000)
Subject: - Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories)
X-Git-Tag: php-5.4.0alpha1~191^2~2077
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ef9a73ab17a06843fda911e5ec8d6309a8ab1e3;p=php

- Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories)
---

diff --git a/main/php_ini.c b/main/php_ini.c
index 4c3b67a595..69c4b69d37 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -814,7 +814,7 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC)
 		while ((ptr = strchr(ptr, '/')) != NULL) {
 			*ptr = 0;
 			/* Search for source array matching the path from configuration_hash */
-			if (zend_hash_find(&configuration_hash, path, path_len, (void **) &tmp) == SUCCESS) {
+			if (zend_hash_find(&configuration_hash, path, strlen(path) + 1, (void **) &tmp) == SUCCESS) {
 				php_ini_activate_config(Z_ARRVAL_P(tmp), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
 			}
 			*ptr = '/';