cvs: php-src /ext/session session.c /ext/standard basic_functions.c
| From: | Ilia Alshanetsky | Date: | Sun, 01 Oct 2006 21:00:00 +0000 |
| Subject: | cvs: php-src /ext/session session.c /ext/standard basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40795@lists.php.net to get a copy of this message | ||
iliaa Sun Oct 1 21:00:00 2006 UTC
Modified files:
/php-src/ext/session session.c
/php-src/ext/standard basic_functions.c
Log:
MFB: Fixed bug #38993 (Fixed safe_mode/open_basedir checks for
session.save_path, allowing them to account for extra parameters).
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.451&r2=1.452&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.451 php-src/ext/session/session.c:1.452
--- php-src/ext/session/session.c:1.451 Tue Sep 19 10:38:30 2006
+++ php-src/ext/session/session.c Sun Oct 1 21:00:00 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.451 2006/09/19 10:38:30 dmitry Exp $ */
+/* $Id: session.c,v 1.452 2006/10/01 21:00:00 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -151,7 +151,15 @@
{
/* Only do the safemode/open_basedir check at runtime */
if (stage == PHP_INI_STAGE_RUNTIME) {
- if (php_check_open_basedir(new_value TSRMLS_CC)) {
+ char *p;
+
+ if ((p = zend_memrchr(new_value, ';', new_value_length))) {
+ p++;
+ } else {
+ p = new_value;
+ }
+
+ if (php_check_open_basedir(p TSRMLS_CC)) {
return FAILURE;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.805&r2=1.806&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.805 php-src/ext/standard/basic_functions.c:1.806
--- php-src/ext/standard/basic_functions.c:1.805 Fri Sep 22 01:55:47 2006
+++ php-src/ext/standard/basic_functions.c Sun Oct 1 21:00:00 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.805 2006/09/22 01:55:47 pollita Exp $ */
+/* $Id: basic_functions.c,v 1.806 2006/10/01 21:00:00 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -5660,7 +5660,6 @@
_CHECK_PATH(varname, "java.class.path") ||
_CHECK_PATH(varname, "java.home") ||
_CHECK_PATH(varname, "java.library.path") ||
- _CHECK_PATH(varname, "session.save_path") ||
_CHECK_PATH(varname, "vpopmail.directory")) {
if (php_check_open_basedir(Z_STRVAL_PP(new_value) TSRMLS_CC)) {