pajoye Thu, 15 Oct 2009 13:28:55 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289668
Log: - Merge: - #48779, fix another use case where / usage may differ Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error Changed paths: _U php/php-src/branches/PHP_5_3_1/ _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_1/main/php_ini.c U php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_1 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:289667 /php/php-src/trunk:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:289667 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_1/main/php_ini.c =================================================================== --- php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-15 13:09:25 UTC (rev 289667) +++ php/php-src/branches/PHP_5_3_1/main/php_ini.c 2009-10-15 13:28:55 UTC (rev 289668) @@ -793,10 +793,18 @@ zval *tmp; char *ptr; +#if PHP_WIN32 + char path_bak[MAXPATHLEN]; + memcpy(path_bak, path, path_len); + path_bak[path_len] = 0; + TRANSLATE_SLASHES_LOWER(path_bak); + path = path_bak; +#endif + /* Walk through each directory in path and apply any found per-dir-system-configuration from configuration_hash */ if (has_per_dir_config && path && path_len) { ptr = path + 1; - while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) { + 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) { Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c =================================================================== --- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-15 13:09:25 UTC (rev 289667) +++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-15 13:28:55 UTC (rev 289668) @@ -818,10 +818,6 @@ path_len = zend_dirname(path, path_len); } path[path_len] = 0; -#ifdef PHP_WIN32 - /* paths on windows should be case-insensitive */ - zend_str_tolower(path, path_len); -#endif /* Activate per-dir-system-configuration defined in php.ini and stored into configuration_hash during startup */ php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /* Note: for global settings sake we check from root to path */ Property changes on: php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /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:289667 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
