[PHP-CVS] cvs: php-src(PHP_5_1) /main main.c

[Ilia Alshanetsky]

iliaa           Thu Aug 10 21:49:57 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/main       main.c 
  Log:
  disable realpath cache for safe_mode & open_basedir
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.24&r2=1.640.2.25&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.24 php-src/main/main.c:1.640.2.25
--- php-src/main/main.c:1.640.2.24      Thu May 11 22:11:17 2006
+++ php-src/main/main.c Thu Aug 10 21:49:56 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.24 2006/05/11 22:11:17 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.25 2006/08/10 21:49:56 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -1091,6 +1091,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);
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php