cvs: php-src /main fopen_wrappers.c
| From: | Ilia Alshanetsky | Date: | Tue, 10 Feb 2004 16:08:56 +0000 |
| Subject: | cvs: php-src /main fopen_wrappers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26084@lists.php.net to get a copy of this message | ||
iliaa Tue Feb 10 11:08:56 2004 EDT
Modified files:
/php-src/main fopen_wrappers.c
Log:
Fixed bug #26653 (open_basedir incorrectly resolved on win32).
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.168&r2=1.169&ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.168 php-src/main/fopen_wrappers.c:1.169
--- php-src/main/fopen_wrappers.c:1.168 Thu Jan 8 03:17:53 2004
+++ php-src/main/fopen_wrappers.c Tue Feb 10 11:08:54 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.168 2004/01/08 08:17:53 andi Exp $ */
+/* $Id: fopen_wrappers.c,v 1.169 2004/02/10 16:08:54 iliaa Exp $ */
/* {{{ includes
*/
@@ -131,15 +131,15 @@
if ((expand_filepath(path, resolved_name TSRMLS_CC) != NULL) &&
(expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL)) {
/* Handler for basedirs that end with a / */
resolved_basedir_len = strlen(resolved_basedir);
- if (basedir[strlen(basedir)-1] == PHP_DIR_SEPARATOR &&
resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
- resolved_basedir[resolved_basedir_len] = '/';
+ if (resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
+ resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
resolved_basedir[++resolved_basedir_len] = '\0';
}
if (path[strlen(path)-1] == PHP_DIR_SEPARATOR) {
resolved_name_len = strlen(resolved_name);
if (resolved_name[resolved_name_len - 1] != PHP_DIR_SEPARATOR) {
- resolved_name[resolved_name_len] = '/';
+ resolved_name[resolved_name_len] = PHP_DIR_SEPARATOR;
resolved_name[++resolved_name_len] = '\0';
}
}