cvs: /php4 main.c php_globals.h

rasmus Fri Apr 14 07:01:02 2000 EDT Modified files: /php4 main.c php_globals.h Log: Make error_prepend_string and error_append_string work @Make error_prepend_string and error_append_string work Index: php4/main.c diff -u php4/main.c:1.231 php4/main.c:1.232 --- php4/main.c:1.231 Mon Apr 10 10:39:11 2000 +++ php4/main.c Fri Apr 14 07:00:32 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.231 2000/04/10 17:39:11 andi Exp $ */ +/* $Id: main.c,v 1.232 2000/04/14 14:00:32 rasmus Exp $ */ #include <stdio.h> @@ -179,6 +179,8 @@ STD_PHP_INI_BOOLEAN("asp_tags", "0", PHP_INI_ALL, OnUpdateBool, asp_tags, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("display_errors", "1", PHP_INI_ALL, OnUpdateBool, display_errors, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("enable_dl", "1", PHP_INI_SYSTEM, OnUpdateBool, enable_dl, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("error_append_string", NULL, PHP_INI_ALL, OnUpdateString, error_append_string, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("error_prepend_string", NULL, PHP_INI_ALL, OnUpdateString, error_prepend_string, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("expose_php", "1", PHP_INI_SYSTEM, OnUpdateBool, expose_php, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("ignore_user_abort", "1", PHP_INI_ALL, OnUpdateBool, ignore_user_abort, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("implicit_flush", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, implicit_flush, php_core_globals, core_globals) Index: php4/php_globals.h diff -u php4/php_globals.h:1.46 php4/php_globals.h:1.47 --- php4/php_globals.h:1.46 Sat Feb 26 15:50:11 2000 +++ php4/php_globals.h Fri Apr 14 07:00:32 2000 @@ -87,6 +87,9 @@ char *upload_tmp_dir; long upload_max_filesize; + char *error_append_string; + char *error_prepend_string; + char *auto_prepend_file; char *auto_append_file;