CVS update: php31/main
| From: | zeev | Date: | Fri, 21 Aug 1998 17:37:06 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-434@lists.php.net to get a copy of this message | ||
Date: Friday August 21, 1998 @ 13:37
Author: zeev
Update of /repository/php31/main
In directory asf:/tmp/cvs-serv28576/main
Modified Files:
main.c php3_ini.c php3_ini.h
Added Files:
automated_configuration.h
automated_configuration_definitions.h
Log Message:
Initial automated configuration work. php3_ini_structure is now dynamically generated.
Index: php31/main/main.c
diff -c php31/main/main.c:2.16 php31/main/main.c:2.17
*** php31/main/main.c:2.16 Fri Aug 21 13:16:59 1998
--- php31/main/main.c Fri Aug 21 13:37:06 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.16 1998/08/21 17:16:59 shane Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.17 1998/08/21 17:37:06 zeev Exp $ */
/* #define CRASH_DETECTION */
***************
*** 564,574 ****
GLOBAL(function_state.handler) = NULL;
GLOBAL(function_state.func_arg_types) = NULL;
GLOBAL(phplineno) = 1;
! GLOBAL(error_reporting) = GLOBAL(php3_ini)->errors;
GLOBAL(shutdown_requested) = 0;
GLOBAL(header_is_being_sent) = 0;
GLOBAL(php3_track_vars) = GLOBAL(php3_ini)->track_vars;
! GLOBAL(error_reporting) = GLOBAL(php3_ini)->errors;
}
--- 564,574 ----
GLOBAL(function_state.handler) = NULL;
GLOBAL(function_state.func_arg_types) = NULL;
GLOBAL(phplineno) = 1;
! GLOBAL(error_reporting) = GLOBAL(php3_ini)->error_reporting;
GLOBAL(shutdown_requested) = 0;
GLOBAL(header_is_being_sent) = 0;
GLOBAL(php3_track_vars) = GLOBAL(php3_ini)->track_vars;
! GLOBAL(error_reporting) = GLOBAL(php3_ini)->error_reporting;
}
***************
*** 858,865 ****
if (cfg_get_long("precision", &php3_ini_master.precision) == FAILURE) {
php3_ini_master.precision = 14;
}
! if (cfg_get_string("SMTP", &php3_ini_master.smtp) == FAILURE) {
! php3_ini_master.smtp = "localhost";
}
if (cfg_get_string("sendmail_path", &php3_ini_master.sendmail_path) == FAILURE
|| !php3_ini_master.sendmail_path[0]) {
--- 858,865 ----
if (cfg_get_long("precision", &php3_ini_master.precision) == FAILURE) {
php3_ini_master.precision = 14;
}
! if (cfg_get_string("SMTP", &php3_ini_master.SMTP) == FAILURE) {
! php3_ini_master.SMTP = "localhost";
}
if (cfg_get_string("sendmail_path", &php3_ini_master.sendmail_path) == FAILURE
|| !php3_ini_master.sendmail_path[0]) {
***************
*** 872,888 ****
if (cfg_get_string("sendmail_from", &php3_ini_master.sendmail_from) == FAILURE) {
php3_ini_master.sendmail_from = NULL;
}
! if (cfg_get_string("cgi_ext", &php3_ini_master.cgi_ext) == FAILURE) {
! php3_ini_master.cgi_ext = NULL;
! }
! if (cfg_get_string("nsapi_ext", &php3_ini_master.cgi_ext) == FAILURE) {
! php3_ini_master.nsapi_ext = NULL;
! }
! if (cfg_get_string("isapi_ext", &php3_ini_master.cgi_ext) == FAILURE) {
! php3_ini_master.isapi_ext = NULL;
! }
! if (cfg_get_long("error_reporting", &php3_ini_master.errors) == FAILURE) {
! php3_ini_master.errors = E_ALL & ~E_NOTICE;
}
if (cfg_get_string("error_log", &php3_ini_master.error_log) == FAILURE) {
php3_ini_master.error_log = NULL;
--- 872,879 ----
if (cfg_get_string("sendmail_from", &php3_ini_master.sendmail_from) == FAILURE) {
php3_ini_master.sendmail_from = NULL;
}
! if (cfg_get_long("error_reporting", &php3_ini_master.error_reporting) == FAILURE)
{
! php3_ini_master.error_reporting = E_ALL & ~E_NOTICE;
}
if (cfg_get_string("error_log", &php3_ini_master.error_log) == FAILURE) {
php3_ini_master.error_log = NULL;
Index: php31/main/php3_ini.c
diff -c php31/main/php3_ini.c:2.0 php31/main/php3_ini.c:2.1
*** php31/main/php3_ini.c:2.0 Fri Jul 3 09:17:27 1998
--- php31/main/php3_ini.c Fri Aug 21 13:37:06 1998
***************
*** 36,45 ****
php3_ini_structure *add = (php3_ini_structure *) addv;
/* Now, add any fields that have changed in *add compared to the master config */
! if (add->smtp != php3_ini_master.smtp) newini->smtp = add->smtp;
if (add->sendmail_path != php3_ini_master.sendmail_path) newini->sendmail_path =
add->sendmail_path;
if (add->sendmail_from != php3_ini_master.sendmail_from) newini->sendmail_from =
add->sendmail_from;
! if (add->errors != php3_ini_master.errors) newini->errors = add->errors;
if (add->magic_quotes_gpc != php3_ini_master.magic_quotes_gpc) newini->magic_quotes_gpc =
add->magic_quotes_gpc;
if (add->magic_quotes_runtime != php3_ini_master.magic_quotes_runtime)
newini->magic_quotes_runtime = add->magic_quotes_runtime;
if (add->magic_quotes_sybase != php3_ini_master.magic_quotes_sybase)
newini->magic_quotes_sybase = add->magic_quotes_sybase;
--- 36,45 ----
php3_ini_structure *add = (php3_ini_structure *) addv;
/* Now, add any fields that have changed in *add compared to the master config */
! if (add->SMTP != php3_ini_master.SMTP) newini->SMTP = add->SMTP;
if (add->sendmail_path != php3_ini_master.sendmail_path) newini->sendmail_path =
add->sendmail_path;
if (add->sendmail_from != php3_ini_master.sendmail_from) newini->sendmail_from =
add->sendmail_from;
! if (add->error_reporting != php3_ini_master.error_reporting) newini->error_reporting =
add->error_reporting;
if (add->magic_quotes_gpc != php3_ini_master.magic_quotes_gpc) newini->magic_quotes_gpc =
add->magic_quotes_gpc;
if (add->magic_quotes_runtime != php3_ini_master.magic_quotes_runtime)
newini->magic_quotes_runtime = add->magic_quotes_runtime;
if (add->magic_quotes_sybase != php3_ini_master.magic_quotes_sybase)
newini->magic_quotes_sybase = add->magic_quotes_sybase;
***************
*** 51,67 ****
if (add->safe_mode != php3_ini_master.safe_mode) newini->safe_mode = add->safe_mode;
if (add->track_vars != php3_ini_master.track_vars) newini->track_vars = add->track_vars;
if (add->safe_mode_exec_dir != php3_ini_master.safe_mode_exec_dir)
newini->safe_mode_exec_dir = add->safe_mode_exec_dir;
- if (add->cgi_ext != php3_ini_master.cgi_ext) newini->cgi_ext = add->cgi_ext;
- if (add->isapi_ext != php3_ini_master.isapi_ext) newini->isapi_ext = add->isapi_ext;
- if (add->nsapi_ext != php3_ini_master.nsapi_ext) newini->nsapi_ext = add->nsapi_ext;
if (add->include_path != php3_ini_master.include_path) newini->include_path =
add->include_path;
if (add->auto_prepend_file != php3_ini_master.auto_prepend_file) newini->auto_prepend_file
= add->auto_prepend_file;
if (add->auto_append_file != php3_ini_master.auto_append_file) newini->auto_append_file =
add->auto_append_file;
if (add->upload_tmp_dir != php3_ini_master.upload_tmp_dir) newini->upload_tmp_dir =
add->upload_tmp_dir;
if (add->extension_dir != php3_ini_master.extension_dir) newini->extension_dir =
add->extension_dir;
if (add->short_open_tag != php3_ini_master.short_open_tag) newini->short_open_tag =
add->short_open_tag;
if (add->debugger_host != php3_ini_master.debugger_host) newini->debugger_host =
add->debugger_host;
if (add->debugger_port != php3_ini_master.debugger_port) newini->debugger_port =
add->debugger_port;
if (add->error_log != php3_ini_master.error_log) newini->error_log = add->error_log;
/* skip the highlight stuff */
if (add->sql_safe_mode != php3_ini_master.sql_safe_mode) newini->sql_safe_mode =
add->sql_safe_mode;
--- 51,66 ----
if (add->safe_mode != php3_ini_master.safe_mode) newini->safe_mode = add->safe_mode;
if (add->track_vars != php3_ini_master.track_vars) newini->track_vars = add->track_vars;
if (add->safe_mode_exec_dir != php3_ini_master.safe_mode_exec_dir)
newini->safe_mode_exec_dir = add->safe_mode_exec_dir;
if (add->include_path != php3_ini_master.include_path) newini->include_path =
add->include_path;
if (add->auto_prepend_file != php3_ini_master.auto_prepend_file) newini->auto_prepend_file
= add->auto_prepend_file;
if (add->auto_append_file != php3_ini_master.auto_append_file) newini->auto_append_file =
add->auto_append_file;
if (add->upload_tmp_dir != php3_ini_master.upload_tmp_dir) newini->upload_tmp_dir =
add->upload_tmp_dir;
if (add->extension_dir != php3_ini_master.extension_dir) newini->extension_dir =
add->extension_dir;
if (add->short_open_tag != php3_ini_master.short_open_tag) newini->short_open_tag =
add->short_open_tag;
+ /*
if (add->debugger_host != php3_ini_master.debugger_host) newini->debugger_host =
add->debugger_host;
if (add->debugger_port != php3_ini_master.debugger_port) newini->debugger_port =
add->debugger_port;
+ */
if (add->error_log != php3_ini_master.error_log) newini->error_log = add->error_log;
/* skip the highlight stuff */
if (add->sql_safe_mode != php3_ini_master.sql_safe_mode) newini->sql_safe_mode =
add->sql_safe_mode;
Index: php31/main/php3_ini.h
diff -c php31/main/php3_ini.h:2.4 php31/main/php3_ini.h:2.5
*** php31/main/php3_ini.h:2.4 Thu Aug 20 17:50:31 1998
--- php31/main/php3_ini.h Fri Aug 21 13:37:06 1998
***************
*** 36,94 ****
#endif
#endif
! typedef struct {
! char *smtp;
! char *domain;
! char *sendmail_path;
! char *sendmail_from; /*win 32 only*/
! long precision;
! long errors;
! long magic_quotes_gpc;
! long magic_quotes_runtime;
! long magic_quotes_sybase;
! long track_errors;
! long display_errors;
! long log_errors;
! long warn_plus_overloading;
! char *doc_root;
! char *user_dir;
! long safe_mode;
! long track_vars;
! char *safe_mode_exec_dir;
! char *cgi_ext;
! char *isapi_ext;
! char *nsapi_ext;
! char *include_path;
! char *auto_prepend_file;
! char *auto_append_file;
! char *upload_tmp_dir;
! char *extension_dir;
! long short_open_tag;
! char *debugger_host;
! long debugger_port;
! char *error_log;
! char *highlight_comment;
! char *highlight_default;
! char *highlight_html;
! char *highlight_string;
! char *highlight_bg;
! char *highlight_keyword;
! long sql_safe_mode;
! long xbithack;
! long engine;
! long last_modified;
! long max_execution_time;
! long memory_limit;
! char *browscap;
! char *arg_separator;
! char *gpc_order;
! long y2k_compliance;
! long define_syslog_variables;
! char *error_prepend_string;
! char *error_append_string;
! char *open_basedir;
! long enable_dl;
! } php3_ini_structure;
#if MSVC5
#define S_IXUSR _S_IEXEC
--- 36,43 ----
#endif
#endif
! #define AC_PHP_INI
! #include "automated_configuration.h"
#if MSVC5
#define S_IXUSR _S_IEXEC
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net