svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/php_ini.c trunk/main/php_ini.c
| From: | Jani Taskinen | Date: | Sat, 16 Jan 2010 21:01:12 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/php_ini.c trunk/main/php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61560@lists.php.net to get a copy of this message | ||
jani Sat, 16 Jan 2010 21:01:12 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293627
Log:
- Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories)
Bug: http://bugs.php.net/48811 (Assigned) Directives in PATH
section do not get applied to subdirectories
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/trunk/main/php_ini.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-01-16 20:55:07 UTC (rev 293626)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-01-16 21:01:12 UTC (rev 293627)
@@ -28,6 +28,8 @@
- 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)
Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2010-01-16 20:55:07 UTC (rev 293626)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2010-01-16 21:01:12 UTC (rev 293627)
@@ -807,7 +807,7 @@
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 = '/';
Modified: php/php-src/trunk/main/php_ini.c
===================================================================
--- php/php-src/trunk/main/php_ini.c 2010-01-16 20:55:07 UTC (rev 293626)
+++ php/php-src/trunk/main/php_ini.c 2010-01-16 21:01:12 UTC (rev 293627)
@@ -814,7 +814,7 @@
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 = '/';