iliaa Tue Sep 27 11:08:44 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/main fopen_wrappers.c
/php-src NEWS
Log:
MFH: Fixed bug #32937 (open_basedir looses trailing / in the limiter).
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.153.2.10.2.1&r2=1.153.2.10.2.2&ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.153.2.10.2.1
php-src/main/fopen_wrappers.c:1.153.2.10.2.2
--- php-src/main/fopen_wrappers.c:1.153.2.10.2.1 Tue Jul 26 09:51:33 2005
+++ php-src/main/fopen_wrappers.c Tue Sep 27 11:08:43 2005
@@ -16,7 +16,7 @@
| Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.153.2.10.2.1 2005/07/26 13:51:33 hyanantha Exp $
*/
+/* $Id: fopen_wrappers.c,v 1.153.2.10.2.2 2005/09/27 15:08:43 iliaa Exp $ */
/* {{{ includes
*/
@@ -110,8 +110,8 @@
/* Handler for basedirs that end with a / */
resolved_basedir_len = strlen(resolved_basedir);
if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) {
- if (resolved_basedir[resolved_basedir_len - 1] == '/') {
- resolved_basedir[resolved_basedir_len - 1] =
PHP_DIR_SEPARATOR;
+ if (resolved_basedir[resolved_basedir_len - 1] !=
PHP_DIR_SEPARATOR) {
+ resolved_basedir[resolved_basedir_len] =
PHP_DIR_SEPARATOR;
resolved_basedir[++resolved_basedir_len] = '\0';
}
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.41&r2=1.1247.2.920.2.42&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.41 php-src/NEWS:1.1247.2.920.2.42
--- php-src/NEWS:1.1247.2.920.2.41 Mon Sep 26 11:19:04 2005
+++ php-src/NEWS Tue Sep 27 11:08:43 2005
@@ -28,6 +28,7 @@
(Ilia)
- Fixed bug #33940 (array_map() fails to pass by reference when called
recursively). (Dmitry)
+- Fixed bug #32937 (open_basedir looses trailing / in the limiter). (Adam C.)
- Fixed bug #33690 (Crash setting some ini directives in httpd.conf). (Rasmus)
- Fixed bug #33673 (Added detection for partially uploaded files). (Ilia)
- Fixed bug #33648 (Using --with-regex=system causes compile failure). (Andrei)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
