Disable realpath cache when open_basedir or safe_mode are enabled on a

per-request basis.

diff --git a/NEWS b/NEWS
index 0271685f149eb400fe188146cf83ba5a49ae99f5..9d16f9ab62d54ffdd8fd602edf3f7de0bf30dc39 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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

diff --git a/main/main.c b/main/main.c
index ab35f2ec3d9fda1d7d25db07af8aaf67f5ef9139..9335f3dc7311c15661c95aaf6b611d2f3c819be1 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1097,6 +1097,11 @@ int php_request_startup(TSRMLS_D)
                        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);
                }