dgaudet 99/02/22 09:07:40
Modified: src CHANGES src/main http_config.c http_core.c Log: pad out some initializers; reduce a string constant from 510 to below 509 characters Submitted by: John Bley <[EMAIL PROTECTED]> Revision Changes Path 1.1257 +2 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1256 retrieving revision 1.1257 diff -u -r1.1256 -r1.1257 --- CHANGES 1999/02/20 18:12:32 1.1256 +++ CHANGES 1999/02/22 17:07:37 1.1257 @@ -1,5 +1,7 @@ Changes with Apache 1.3.5 + *) Fixed a few compiler nits. [John Bley <[EMAIL PROTECTED]>] + *) Added some informative error messages for some failed malloc() calls. [John Bley <[EMAIL PROTECTED]>, Jim Jagielski] 1.142 +1 -1 apache-1.3/src/main/http_config.c Index: http_config.c =================================================================== RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- http_config.c 1999/02/20 18:12:35 1.141 +++ http_config.c 1999/02/22 17:07:39 1.142 @@ -1075,7 +1075,7 @@ */ static cmd_parms default_parms = -{NULL, 0, -1, NULL, NULL, NULL, NULL, NULL, NULL}; +{NULL, 0, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; API_EXPORT(char *) ap_server_root_relative(pool *p, char *file) { 1.250 +7 -8 apache-1.3/src/main/http_core.c Index: http_core.c =================================================================== RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- http_core.c 1999/02/09 20:20:26 1.249 +++ http_core.c 1999/02/22 17:07:39 1.250 @@ -1902,7 +1902,7 @@ "Error:\tApache has not been designed to serve pages while\n" "\trunning as root. There are known race conditions that\n" "\twill allow any local user to read any file on the system.\n" - "\tShould you still desire to serve pages as root then\n" + "\tIf you still desire to serve pages as root then\n" "\tadd -DBIG_SECURITY_HOLE to the EXTRA_CFLAGS line in your\n" "\tsrc/Configuration file and rebuild the server. It is\n" "\tstrongly suggested that you instead modify the User\n" @@ -2859,6 +2859,10 @@ { "BS2000Account", set_bs2000_account, NULL, RSRC_CONF, TAKE1, "Name of server User's bs2000 logon account name" }, #endif +#ifdef WIN32 +{ "ScriptInterpreterSource", set_interpreter_source, NULL, OR_FILEINFO, TAKE1, + "Where to find interpreter to run Win32 scripts (Registry or script shebang line)" }, +#endif { "ServerTokens", set_serv_tokens, NULL, RSRC_CONF, TAKE1, "Determine tokens displayed in the Server: header - Min(imal), OS or Full" }, { "LimitRequestLine", set_limit_req_line, NULL, RSRC_CONF, TAKE1, @@ -2870,12 +2874,7 @@ { "LimitRequestBody", set_limit_req_body, (void*)XtOffsetOf(core_dir_config, limit_req_body), OR_ALL, TAKE1, - "Limit (in bytes) on maximum size of request message body" }, -#ifdef WIN32 -{ "ScriptInterpreterSource", set_interpreter_source, NULL, OR_FILEINFO, TAKE1, - "Where to find interpreter to run Win32 scripts (Registry or script shebang line)" }, -#endif -{ NULL }, + "Limit (in bytes) on maximum size of request message body" } }; /***************************************************************** @@ -3116,7 +3115,7 @@ static const handler_rec core_handlers[] = { { "*/*", default_handler }, { "default-handler", default_handler }, -{ NULL } +{ NULL, NULL } }; API_VAR_EXPORT module core_module = {