iliaa Wed Feb 2 18:43:47 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/main fopen_wrappers.c
Log:
MFH: Fixed bug #31514 (open_basedir uses path_translated rather then cwd for .
translation).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.228&r2=1.1760.2.229&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.228 php-src/NEWS:1.1760.2.229
--- php-src/NEWS:1.1760.2.228 Wed Feb 2 05:34:21 2005
+++ php-src/NEWS Wed Feb 2 18:43:47 2005
@@ -33,6 +33,8 @@
(Marcus)
- Fixed bug #31623 (OCILogin does not support password grace period).
(daniel dot beet at accuratesoftware dot com, Tony)
+- Fixed bug #31514 (open_basedir uses path_translated rather then cwd for .
+ translation). (Ilia)
- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
- Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen).
(Ilia)
- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia)
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.170&r2=1.170.2.1&ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.170
php-src/main/fopen_wrappers.c:1.170.2.1
--- php-src/main/fopen_wrappers.c:1.170 Mon Mar 15 19:31:22 2004
+++ php-src/main/fopen_wrappers.c Wed Feb 2 18:43:47 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.170 2004/03/16 00:31:22 iliaa Exp $ */
+/* $Id: fopen_wrappers.c,v 1.170.2.1 2005/02/02 23:43:47 iliaa Exp $ */
/* {{{ includes
*/
@@ -105,24 +105,11 @@
char resolved_name[MAXPATHLEN];
char resolved_basedir[MAXPATHLEN];
char local_open_basedir[MAXPATHLEN];
- int local_open_basedir_pos;
int resolved_basedir_len;
int resolved_name_len;
/* Special case basedir==".": Use script-directory */
- if ((strcmp(basedir, ".") == 0) &&
- SG(request_info).path_translated &&
- *SG(request_info).path_translated
- ) {
- strlcpy(local_open_basedir, SG(request_info).path_translated,
sizeof(local_open_basedir));
- local_open_basedir_pos = strlen(local_open_basedir) - 1;
-
- /* Strip filename */
- while (!IS_SLASH(local_open_basedir[local_open_basedir_pos])
- && (local_open_basedir_pos >= 0)) {
- local_open_basedir[local_open_basedir_pos--] = 0;
- }
- } else {
+ if (strcmp(basedir, ".") || !VCWD_GETCWD(local_open_basedir,
MAXPATHLEN)) {
/* Else use the unmodified path */
strlcpy(local_open_basedir, basedir,
sizeof(local_open_basedir));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
