cvs: php-src /main php_ini.c
| From: | Hartmut Holzgraefe | Date: | Wed, 27 Jul 2005 15:13:50 +0000 |
| Subject: | cvs: php-src /main php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33091@lists.php.net to get a copy of this message | ||
hholzgra Wed Jul 27 11:13:50 2005 EDT
Modified files:
/php-src/main php_ini.c
Log:
edge case: do not remove trailing slash for root directory (Bug #33882)
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.131&r2=1.132&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.131 php-src/main/php_ini.c:1.132
--- php-src/main/php_ini.c:1.131 Wed Jul 27 11:12:18 2005
+++ php-src/main/php_ini.c Wed Jul 27 11:13:50 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.131 2005/07/27 15:12:18 hholzgra Exp $ */
+/* $Id: php_ini.c,v 1.132 2005/07/27 15:13:50 hholzgra Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -362,7 +362,7 @@
if (binary_location) {
char *separator_location = strrchr(binary_location, DEFAULT_SLASH);
- if (separator_location) {
+ if (separator_location && separator_location != binary_location) {
*(separator_location) = 0;
}
if (*php_ini_search_path) {