CVS update: php31/sapi

Date: Wednesday August 26, 1998 @ 1:04 Author: rasmus Update of /repository/php31/sapi In directory asf:/export/home/rasmus/php31/sapi Modified Files: mod_php3.c Log Message: Catch some missing 3.0 patches Index: php31/sapi/mod_php3.c diff -c php31/sapi/mod_php3.c:2.1 php31/sapi/mod_php3.c:2.2 *** php31/sapi/mod_php3.c:2.1 Thu Aug 20 19:06:42 1998 --- php31/sapi/mod_php3.c Wed Aug 26 01:04:54 1998 *************** *** 27,33 **** | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.c,v 2.1 1998/08/20 23:06:42 zeev Exp $ */ #include "php3_apache.h" --- 27,33 ---- | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.c,v 2.2 1998/08/26 05:04:54 rasmus Exp $ */ #include "php3_apache.h" *************** *** 223,228 **** --- 223,231 ---- case 12: conf->magic_quotes_sybase = val; break; + case 13: + conf->enable_dl = val; + break; } return NULL; } *************** *** 293,298 **** --- 296,313 ---- case 15: conf->gpc_order = pstrdup(cmd->pool, arg); break; + case 16: + conf->error_prepend_string = pstrdup(cmd->pool, arg); + break; + case 17: + conf->error_append_string = pstrdup(cmd->pool, arg); + break; + case 18: + conf->open_basedir = pstrdup(cmd->pool, arg); + break; + case 19: + conf->upload_max_filesize = atol(arg); + break; } return NULL; } *************** *** 340,375 **** command_rec php3_commands[] = { ! {"php3_error_reporting", php3take1handler, (void *) 0, OR_OPTIONS, TAKE1, "error reporting level"}, ! {"php3_doc_root", php3take1handler, (void *) 1, ACCESS_CONF | RSRC_CONF, TAKE1, "directory"}, /* not used yet */ ! {"php3_user_dir", php3take1handler, (void *) 2, ACCESS_CONF | RSRC_CONF, TAKE1, "user directory"}, /* not used yet */ ! {"php3_safe_mode_exec_dir", php3take1handler, (void *) 3, ACCESS_CONF | RSRC_CONF, TAKE1, "safe mode executable dir"}, ! {"php3_include_path", php3take1handler, (void *) 4, OR_OPTIONS, TAKE1, "colon-separated path"}, ! {"php3_auto_prepend_file", php3take1handler, (void *) 5, OR_OPTIONS, TAKE1, "file name"}, ! {"php3_auto_append_file", php3take1handler, (void *) 6, OR_OPTIONS, TAKE1, "file name"}, ! {"php3_upload_tmp_dir", php3take1handler, (void *) 7, ACCESS_CONF | RSRC_CONF, TAKE1, "directory"}, ! {"php3_extension_dir", php3take1handler, (void *) 8, ACCESS_CONF | RSRC_CONF, TAKE1, "directory"}, ! {"php3_error_log", php3take1handler, (void *) 9, OR_OPTIONS, TAKE1, "error log file"}, ! {"php3_arg_separator", php3take1handler, (void *) 10, OR_OPTIONS, TAKE1, "GET method arg separator"}, ! {"php3_max_execution_time", php3take1handler, (void *) 11, OR_OPTIONS, TAKE1, "Max script run time in seconds"}, ! {"php3_memory_limit", php3take1handler, (void *) 12, OR_OPTIONS, TAKE1, "Max memory in bytes a script may use"}, ! {"php3_sendmail_path", php3take1handler, (void *) 13, OR_OPTIONS, TAKE1, "Full path to sendmail binary"}, ! {"php3_browscap", php3take1handler, (void *) 14, OR_OPTIONS, TAKE1, "Full path to browscap file"}, ! {"php3_gpc_order", php3take1handler, (void *) 15, OR_OPTIONS, TAKE1, "Set GET-COOKIE-POST order [default is GPC]"}, ! ! {"php3_track_errors", php3flaghandler, (void *) 0, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_magic_quotes_gpc", php3flaghandler, (void *) 1, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_magic_quotes_runtime", php3flaghandler, (void *) 2, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_short_open_tag", php3flaghandler, (void *) 3, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_safe_mode", php3flaghandler, (void *) 4, ACCESS_CONF | RSRC_CONF, FLAG, "on|off"}, ! {"php3_track_vars", php3flaghandler, (void *) 5, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_sql_safe_mode", php3flaghandler, (void *) 6, ACCESS_CONF | RSRC_CONF, FLAG, "on|off"}, ! {"php3_engine", php3flaghandler, (void *) 7, RSRC_CONF | ACCESS_CONF, FLAG, "on|off"}, ! {"php3_xbithack", php3flaghandler, (void *) 8, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_last_modified", php3flaghandler, (void *) 9, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_log_errors", php3flaghandler, (void *) 10, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_display_errors", php3flaghandler, (void *) 11, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_magic_quotes_sybase", php3flaghandler, (void *) 12, OR_OPTIONS, FLAG, "on|off"}, {NULL} }; --- 355,395 ---- command_rec php3_commands[] = { ! {"php3_error_reporting", php3take1handler, (void *)0, OR_OPTIONS, TAKE1, "error reporting level"}, ! {"php3_doc_root", php3take1handler, (void *)1, ACCESS_CONF|RSRC_CONF, TAKE1, "directory"}, /* not used yet */ ! {"php3_user_dir", php3take1handler, (void *)2, ACCESS_CONF|RSRC_CONF, TAKE1, "user directory"}, /* not used yet */ ! {"php3_safe_mode_exec_dir", php3take1handler, (void *)3, ACCESS_CONF|RSRC_CONF, TAKE1, "safe mode executable dir"}, ! {"php3_include_path", php3take1handler, (void *)4, OR_OPTIONS, TAKE1, "colon-separated path"}, ! {"php3_auto_prepend_file", php3take1handler, (void *)5, OR_OPTIONS, TAKE1, "file name"}, ! {"php3_auto_append_file", php3take1handler, (void *)6, OR_OPTIONS, TAKE1, "file name"}, ! {"php3_upload_tmp_dir", php3take1handler, (void *)7, ACCESS_CONF|RSRC_CONF, TAKE1, "directory"}, ! {"php3_extension_dir", php3take1handler, (void *)8, ACCESS_CONF|RSRC_CONF, TAKE1, "directory"}, ! {"php3_error_log", php3take1handler, (void *)9, OR_OPTIONS, TAKE1, "error log file"}, ! {"php3_arg_separator", php3take1handler, (void *)10, OR_OPTIONS, TAKE1, "GET method arg separator"}, ! {"php3_max_execution_time", php3take1handler, (void *)11, OR_OPTIONS, TAKE1, "Max script run time in seconds"}, ! {"php3_memory_limit", php3take1handler, (void *)12, OR_OPTIONS, TAKE1, "Max memory in bytes a script may use"}, ! {"php3_sendmail_path", php3take1handler, (void *)13, OR_OPTIONS, TAKE1, "Full path to sendmail binary"}, ! {"php3_browscap", php3take1handler, (void *)14, OR_OPTIONS, TAKE1, "Full path to browscap file"}, ! {"php3_gpc_order", php3take1handler, (void *)15, OR_OPTIONS, TAKE1, "Set GET-COOKIE-POST order [default is GPC]"}, ! {"php3_error_prepend_string", php3take1handler, (void *)16, OR_OPTIONS, TAKE1, "String to add before an error message from PHP"}, ! {"php3_error_append_string", php3take1handler, (void *)17, OR_OPTIONS, TAKE1, "String to add after an error message from PHP"}, ! {"php3_open_basedir", php3take1handler, (void *)18, OR_OPTIONS|RSRC_CONF, TAKE1, "Limit opening of files to this directory"}, ! {"php3_upload_max_filesize", php3take1handler, (void *)19, OR_OPTIONS|RSRC_CONF, TAKE1, "Limit uploaded files to this many bytes"}, ! ! {"php3_track_errors", php3flaghandler, (void *)0, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_magic_quotes_gpc", php3flaghandler, (void *)1, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_magic_quotes_runtime", php3flaghandler, (void *)2, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_short_open_tag", php3flaghandler, (void *)3, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_safe_mode", php3flaghandler, (void *)4, ACCESS_CONF|RSRC_CONF, FLAG, "on|off"}, ! {"php3_track_vars", php3flaghandler, (void *)5, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_sql_safe_mode", php3flaghandler, (void *)6, ACCESS_CONF|RSRC_CONF, FLAG, "on|off"}, ! {"php3_engine", php3flaghandler, (void *)7, RSRC_CONF|ACCESS_CONF, FLAG, "on|off"}, ! {"php3_xbithack", php3flaghandler, (void *)8, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_last_modified", php3flaghandler, (void *)9, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_log_errors", php3flaghandler, (void *)10, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_display_errors", php3flaghandler, (void *)11, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_magic_quotes_sybase", php3flaghandler, (void *)12, OR_OPTIONS, FLAG, "on|off"}, ! {"php3_enable_dl", php3flaghandler, (void *)13, RSRC_CONF|ACCESS_CONF, FLAG, "on|off"}, {NULL} }; -- 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