iliaa Tue Sep 27 11:07:49 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.175&r2=1.175.2.1&ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175
php-src/main/fopen_wrappers.c:1.175.2.1
--- php-src/main/fopen_wrappers.c:1.175 Wed Aug 3 10:08:28 2005
+++ php-src/main/fopen_wrappers.c Tue Sep 27 11:07:48 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.175 2005/08/03 14:08:28 sniper Exp $ */
+/* $Id: fopen_wrappers.c,v 1.175.2.1 2005/09/27 15:07:48 iliaa Exp $ */
/* {{{ includes
*/
@@ -108,8 +108,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.2027.2.79&r2=1.2027.2.80&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.79 php-src/NEWS:1.2027.2.80
--- php-src/NEWS:1.2027.2.79 Tue Sep 27 04:23:20 2005
+++ php-src/NEWS Tue Sep 27 11:07:49 2005
@@ -129,6 +129,7 @@
- Fixed bug #33326 (Cannot build extensions with phpize on Macosx). (Jani)
- Fixed bug #32981 (ReflectionMethod::getStaticVariables() causes apache2.0.54
seg fault). (Dmitry)
+- Fixed bug #32937 (open_basedir looses trailing / in the limiter). (Adam
Conrad)
- Fixed bug #32589 (possible crash inside imap_mail_compose() function). (Ilia)
- Fixed bug #32139 (SOAP client does not auto-handle base64 encoding). (Ilia)
- Fixed bug #32010 (Memory leak in mssql_fetch_batch). (fmk)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
