diff options
author | Jani Taskinen <jani@php.net> | 2010-01-16 21:01:12 +0000 |
---|---|---|
committer | Jani Taskinen <jani@php.net> | 2010-01-16 21:01:12 +0000 |
commit | e421bee7af2f0b4461a82605e71d637a441682ea (patch) | |
tree | 1ff05118e862212a0b3bc0616fca86f7174e1290 | |
parent | 915c8778e2c937c0cffccbdd17f628cbc645cb19 (diff) | |
download | php-git-e421bee7af2f0b4461a82605e71d637a441682ea.tar.gz |
- Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories)
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | main/php_ini.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -28,6 +28,8 @@ PHP NEWS - Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick) - Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.) - Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob) +- Fixed bug #48811 (Directives in PATH section do not get applied to + subdirectories). (Patch by: ct at swin dot edu dot au) - Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram) - Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive in HTTP uploads). (Ilia) diff --git a/main/php_ini.c b/main/php_ini.c index cd4341be83..e6c71a14d4 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -807,7 +807,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 = '/'; |