derick Wed Oct 23 05:35:21 2002 EDT
Modified files:
/php4/main main.c
Log:
- Trying to clean up this mess :)
Index: php4/main/main.c
diff -u php4/main/main.c:1.502 php4/main/main.c:1.503
--- php4/main/main.c:1.502 Wed Oct 23 05:31:33 2002
+++ php4/main/main.c Wed Oct 23 05:35:21 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.502 2002/10/23 09:31:33 derick Exp $ */
+/* $Id: main.c,v 1.503 2002/10/23 09:35:21 derick Exp $ */
/* {{{ includes
*/
@@ -251,7 +251,7 @@
STD_PHP_INI_BOOLEAN("html_errors", "1",
PHP_INI_ALL, OnUpdateBool, html_errors,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("xmlrpc_errors", "0",
PHP_INI_SYSTEM, OnUpdateBool, xmlrpc_errors,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("xmlrpc_error_number", "0", PHP_INI_ALL,
OnUpdateInt, xmlrpc_error_number, php_core_globals,
core_globals)
- STD_PHP_INI_ENTRY("max_input_time", "0", PHP_INI_ALL,
OnUpdateInt, max_input_time, php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("max_input_time", "0",
+PHP_INI_ALL, OnUpdateInt, max_input_time,
+php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("ignore_user_abort", "0", PHP_INI_ALL,
OnUpdateBool, ignore_user_abort,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("implicit_flush", "0", PHP_INI_ALL,
OnUpdateBool, implicit_flush,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("log_errors", "0",
PHP_INI_ALL, OnUpdateBool, log_errors,
php_core_globals, core_globals)
@@ -259,34 +259,34 @@
STD_PHP_INI_BOOLEAN("ignore_repeated_errors", "0", PHP_INI_ALL,
OnUpdateBool, ignore_repeated_errors, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("ignore_repeated_source", "0", PHP_INI_ALL,
OnUpdateBool, ignore_repeated_source, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("report_memleaks", "1",
PHP_INI_SYSTEM, OnUpdateBool, report_memleaks,
php_core_globals, core_globals)
- STD_PHP_INI_BOOLEAN("magic_quotes_gpc", "1",
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, magic_quotes_gpc,
php_core_globals, core_globals)
+ STD_PHP_INI_BOOLEAN("magic_quotes_gpc", "1",
+PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, magic_quotes_gpc,
+php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("magic_quotes_runtime", "0", PHP_INI_ALL,
OnUpdateBool, magic_quotes_runtime, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("magic_quotes_sybase", "0", PHP_INI_ALL,
OnUpdateBool, magic_quotes_sybase, php_core_globals,
core_globals)
- STD_PHP_INI_ENTRY("output_buffering", "0",
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateInt, output_buffering,
php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("output_handler", NULL,
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateString, output_handler,
php_core_globals, core_globals)
- STD_PHP_INI_BOOLEAN("register_argc_argv", "1",
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, register_argc_argv,
php_core_globals, core_globals)
- STD_PHP_INI_BOOLEAN("register_globals", "0",
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, register_globals,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("output_buffering", "0",
+PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateInt, output_buffering,
+php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("output_handler", NULL,
+PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, output_handler,
+php_core_globals, core_globals)
+ STD_PHP_INI_BOOLEAN("register_argc_argv", "1",
+PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_argc_argv,
+php_core_globals, core_globals)
+ STD_PHP_INI_BOOLEAN("register_globals", "0",
+PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_globals,
+php_core_globals, core_globals)
#if PHP_SAFE_MODE
STD_PHP_INI_BOOLEAN("safe_mode", "1",
PHP_INI_SYSTEM, OnUpdateBool, safe_mode,
php_core_globals, core_globals)
#else
STD_PHP_INI_BOOLEAN("safe_mode", "0",
PHP_INI_SYSTEM, OnUpdateBool, safe_mode,
php_core_globals, core_globals)
#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_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, short_tags,
zend_compiler_globals, compiler_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_SYSTEM|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)
- STD_PHP_INI_ENTRY("unserialize_callback_func", NULL, PHP_INI_ALL,
OnUpdateString, unserialize_callback_func, php_core_globals,
core_globals)
+ STD_PHP_INI_ENTRY("unserialize_callback_func", NULL, PHP_INI_ALL,
+ OnUpdateString, unserialize_callback_func, php_core_globals,
+ core_globals)
STD_PHP_INI_ENTRY("arg_separator.output", "&", PHP_INI_ALL,
OnUpdateStringUnempty, arg_separator.output, php_core_globals,
core_globals)
STD_PHP_INI_ENTRY("arg_separator.input", "&",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, arg_separator.input,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("auto_append_file", NULL,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString,
auto_append_file, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("auto_prepend_file", NULL,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString,
auto_prepend_file, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("doc_root", NULL,
PHP_INI_SYSTEM, OnUpdateStringUnempty, doc_root,
php_core_globals, core_globals)
- STD_PHP_INI_ENTRY("default_charset", SAPI_DEFAULT_CHARSET, PHP_INI_ALL,
OnUpdateString, default_charset,
sapi_globals_struct,sapi_globals)
- STD_PHP_INI_ENTRY("default_mimetype",SAPI_DEFAULT_MIMETYPE, PHP_INI_ALL,
OnUpdateString, default_mimetype,
sapi_globals_struct,sapi_globals)
+ STD_PHP_INI_ENTRY("default_charset", SAPI_DEFAULT_CHARSET,
+PHP_INI_ALL, OnUpdateString, default_charset,
+sapi_globals_struct,sapi_globals)
+ STD_PHP_INI_ENTRY("default_mimetype", SAPI_DEFAULT_MIMETYPE,
+PHP_INI_ALL, OnUpdateString, default_mimetype,
+sapi_globals_struct,sapi_globals)
STD_PHP_INI_ENTRY("error_log", NULL,
PHP_INI_ALL, OnUpdateString, error_log,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR,
PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("gpc_order", "GPC",
PHP_INI_ALL, OnUpdateStringUnempty, gpc_order,
php_core_globals, core_globals)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
