tony2001 Fri Mar 21 16:39:11 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main main.c Log: MFH: revert http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.19&r2=1.640.2.23.2.57.2.20&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.19 php-src/main/main.c:1.640.2.23.2.57.2.20 --- php-src/main/main.c:1.640.2.23.2.57.2.19 Thu Mar 20 17:30:14 2008 +++ php-src/main/main.c Fri Mar 21 16:39:11 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.19 2008/03/20 17:30:14 stas Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.20 2008/03/21 16:39:11 tony2001 Exp $ */ /* {{{ includes */ @@ -406,7 +406,7 @@ #endif STD_PHP_INI_ENTRY("safe_mode_include_dir", NULL, PHP_INI_SYSTEM, OnUpdateString, safe_mode_include_dir, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("safe_mode_gid", "0", PHP_INI_SYSTEM, OnUpdateBool, safe_mode_gid, php_core_globals, core_globals) - STD_PHP_INI_BOOLEAN("short_open_tag", DEFAULT_SHORT_OPEN_TAG, PHP_INI_ALL, OnUpdateBool, short_tags, zend_compiler_globals, compiler_globals) + STD_PHP_INI_BOOLEAN("short_open_tag", DEFAULT_SHORT_OPEN_TAG, PHP_INI_ALL|PHP_INI_PERDIR, OnUpdateBool, short_tags, zend_compiler_globals, compiler_globals) STD_PHP_INI_BOOLEAN("sql.safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, sql_safe_mode, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("track_errors", "0", PHP_INI_ALL, OnUpdateBool, track_errors, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("y2k_compliance", "1", PHP_INI_ALL, OnUpdateBool, y2k_compliance, php_core_globals, core_globals)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php