bjori Tue Dec 9 10:23:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main main.c
Log:
Whoops. Missing bit from the open_basedir tightening MFH
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.36&r2=1.640.2.23.2.57.2.37&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.36
php-src/main/main.c:1.640.2.23.2.57.2.37
--- php-src/main/main.c:1.640.2.23.2.57.2.36 Wed Nov 12 16:40:40 2008
+++ php-src/main/main.c Tue Dec 9 10:23:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.36 2008/11/12 16:40:40 felipe Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.37 2008/12/09 10:23:44 bjori Exp $ */
/* {{{ includes
*/
@@ -429,7 +429,7 @@
STD_PHP_INI_ENTRY("extension_dir",
PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty,
extension_dir, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("include_path",
PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty,
include_path, php_core_globals, core_globals)
PHP_INI_ENTRY("max_execution_time", "30",
PHP_INI_ALL, OnUpdateTimeout)
- STD_PHP_INI_ENTRY("open_basedir", NULL,
PHP_INI_SYSTEM, OnUpdateString, open_basedir,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("open_basedir", NULL,
PHP_INI_ALL, OnUpdateBaseDir, open_basedir,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("safe_mode_exec_dir", PHP_SAFE_MODE_EXEC_DIR,
PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("file_uploads", "1",
PHP_INI_SYSTEM, OnUpdateBool, file_uploads,
php_core_globals, core_globals)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
