svn: /php/php-src/branches/PHP_5_3_2/ main/php_ini.c tests/security/open_basedir_parse_ini_file.phpt
| From: | Pierre Joye | Date: | Wed, 03 Feb 2010 20:13:18 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_2/ main/php_ini.c tests/security/open_basedir_parse_ini_file.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61742@lists.php.net to get a copy of this message | ||
pajoye Wed, 03 Feb 2010 20:13:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294449
Log:
- Fixed bug #48811 (Directives in PATH section do not get applied to subdirector
Bug: http://bugs.php.net/48811 (Closed) Directives in PATH
section do not get applied to subdirectories
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
U php/php-src/branches/PHP_5_3_2/main/php_ini.c
_U php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293974
/php/php-src/trunk:284726
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Modified: php/php-src/branches/PHP_5_3_2/main/php_ini.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/main/php_ini.c 2010-02-03 20:10:35 UTC (rev 294448)
+++ php/php-src/branches/PHP_5_3_2/main/php_ini.c 2010-02-03 20:13:18 UTC (rev 294449)
@@ -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 = '/';
Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951