iliaa Tue May 16 00:39:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c
/php-src NEWS
Log:
Disable realpath cache when open_basedir or safe_mode are enabled on a
per-request basis.
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.23.2.3&r2=1.640.2.23.2.4&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.3 php-src/main/main.c:1.640.2.23.2.4
--- php-src/main/main.c:1.640.2.23.2.3 Thu May 11 22:10:31 2006
+++ php-src/main/main.c Tue May 16 00:39:32 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.3 2006/05/11 22:10:31 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.4 2006/05/16 00:39:32 iliaa Exp $ */
/* {{{ includes
*/
@@ -1097,6 +1097,11 @@
zend_set_timeout(PG(max_input_time));
}
+ /* Disable realpath cache if safe_mode or open_basedir are set
*/
+ if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
+ CWDG(realpath_cache_size_limit) = 0;
+ }
+
if (PG(expose_php)) {
sapi_add_header(SAPI_PHP_VERSION_HEADER,
sizeof(SAPI_PHP_VERSION_HEADER)-1, 1);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.26&r2=1.2027.2.547.2.27&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.26 php-src/NEWS:1.2027.2.547.2.27
--- php-src/NEWS:1.2027.2.547.2.26 Mon May 15 16:08:18 2006
+++ php-src/NEWS Tue May 16 00:39:32 2006
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, PHP 5.2.0
+- Disable realpath cache when open_basedir or safe_mode are enabled on a
+ per-request basis. (Ilia)
- Optimized require_once/include_once (eliminated fopen() on second usage).
(Dmitry)
- Optimized request shutdown sequence. Restoring ini directives now
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
