dgaudet 98/03/13 11:20:59
Modified: src CHANGES
src/include http_config.h
src/main http_config.c http_core.c
src/modules/example mod_example.c
src/modules/experimental mod_mmap_static.c
src/modules/proxy mod_proxy.c
src/modules/standard mod_access.c mod_actions.c mod_alias.c
mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c
mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c
mod_cgi.c mod_digest.c mod_dir.c mod_env.c
mod_expires.c mod_headers.c mod_imap.c
mod_include.c mod_info.c mod_log_agent.c
mod_log_config.c mod_log_referer.c mod_mime.c
mod_mime_magic.c mod_negotiation.c mod_rewrite.c
mod_setenvif.c mod_so.c mod_speling.c mod_status.c
mod_userdir.c mod_usertrack.c
src/modules/test mod_rndchunk.c mod_test_util_uri.c
Log:
Mark command_rec and handler_rec as const... this is a backwards
compatible change, 3rd party modules shouldn't get any warnings or
anything due to it. But the advantage is that a bunch more data goes
into read-only sections of memory and some systems can take advantage
of that by not duplicating the page across a fork().
Revision Changes Path
1.706 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- CHANGES 1998/03/13 17:03:17 1.705
+++ CHANGES 1998/03/13 19:20:05 1.706
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Mark module command_rec and handler_rec structures const so that they
+ end up in the read-only data section (and are friendlier to systems
+ that don't do optimistic memory allocation on fork()). [Dean Gaudet]
+
*) Add check to the "Port" directive to make sure the specified
port is in the appropriate range. [Ben Hyde]
1.73 +2 -2 apache-1.3/src/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- http_config.h 1998/03/12 10:36:33 1.72
+++ http_config.h 1998/03/13 19:20:10 1.73
@@ -211,8 +211,8 @@
void *(*merge_server_config) (pool *p, void *base_conf, void *new_conf);
#endif
- command_rec *cmds;
- handler_rec *handlers;
+ const command_rec *cmds;
+ const handler_rec *handlers;
/* Hooks for getting into the middle of server ops...
1.105 +3 -3 apache-1.3/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- http_config.c 1998/03/13 13:28:18 1.104
+++ http_config.c 1998/03/13 19:20:13 1.105
@@ -432,7 +432,7 @@
module *modp;
int nhandlers = 0;
int nwildhandlers = 0;
- handler_rec *handp;
+ const handler_rec *handp;
fast_handler_rec *ph, *pw;
char *starp;
@@ -1451,7 +1451,7 @@
* a particular directive is allowed to be used. This procedure prints
* in English where the given (pc) directive can be used.
*/
-void show_overrides(command_rec *pc, module *pm)
+void show_overrides(const command_rec *pc, module *pm)
{
int n = 0;
@@ -1515,7 +1515,7 @@
*/
void show_directives()
{
- command_rec *pc;
+ const command_rec *pc;
int n;
for (n = 0; preloaded_modules[n]; ++n)
1.169 +2 -2 apache-1.3/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- http_core.c 1998/03/13 16:54:15 1.168
+++ http_core.c 1998/03/13 19:20:14 1.169
@@ -1852,7 +1852,7 @@
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
-static command_rec core_cmds[] = {
+static const command_rec core_cmds[] = {
/* Old access config file commands */
@@ -2181,7 +2181,7 @@
return OK;
}
-static handler_rec core_handlers[] = {
+static const handler_rec core_handlers[] = {
{ "*/*", default_handler },
{ NULL }
};
1.27 +2 -2 apache-1.3/src/modules/example/mod_example.c
Index: mod_example.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/example/mod_example.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_example.c 1998/03/13 12:06:59 1.26
+++ mod_example.c 1998/03/13 19:20:16 1.27
@@ -1055,7 +1055,7 @@
/*
* List of directives specific to our module.
*/
-static command_rec example_cmds[] =
+static const command_rec example_cmds[] =
{
{
"Example", /* directive name */
@@ -1086,7 +1086,7 @@
* if a content-handler returns anything except DECLINED, no other
* content-handlers will be called.
*/
-static handler_rec example_handlers[] =
+static const handler_rec example_handlers[] =
{
{"example-handler", example_handler},
{NULL}
1.3 +1 -1 apache-1.3/src/modules/experimental/mod_mmap_static.c
Index: mod_mmap_static.c
===================================================================
RCS file:
/export/home/cvs/apache-1.3/src/modules/experimental/mod_mmap_static.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_mmap_static.c 1998/02/23 00:05:40 1.2
+++ mod_mmap_static.c 1998/03/13 19:20:19 1.3
@@ -354,7 +354,7 @@
}
-static handler_rec mmap_static_handlers[] =
+static const handler_rec mmap_static_handlers[] =
{
{ "*/*", mmap_static_handler },
{ NULL }
1.46 +2 -2 apache-1.3/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mod_proxy.c 1998/03/06 07:50:59 1.45
+++ mod_proxy.c 1998/03/13 19:20:23 1.46
@@ -735,13 +735,13 @@
return NULL;
}
-static handler_rec proxy_handlers[] =
+static const handler_rec proxy_handlers[] =
{
{"proxy-server", proxy_handler},
{NULL}
};
-static command_rec proxy_cmds[] =
+static const command_rec proxy_cmds[] =
{
{"ProxyRequests", set_proxy_req, NULL, RSRC_CONF, FLAG,
"on if the true proxy requests should be accepted"},
1.32 +1 -1 apache-1.3/src/modules/standard/mod_access.c
Index: mod_access.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_access.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_access.c 1998/03/12 11:02:59 1.31
+++ mod_access.c 1998/03/13 19:20:27 1.32
@@ -253,7 +253,7 @@
static char its_an_allow;
-static command_rec access_cmds[] =
+static const command_rec access_cmds[] =
{
{"order", order, NULL, OR_LIMIT, TAKE1,
"'allow,deny', 'deny,allow', or 'mutual-failure'"},
1.24 +2 -2 apache-1.3/src/modules/standard/mod_actions.c
Index: mod_actions.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_actions.c 1998/03/12 11:13:23 1.23
+++ mod_actions.c 1998/03/13 19:20:27 1.24
@@ -142,7 +142,7 @@
return NULL;
}
-static command_rec action_cmds[] =
+static const command_rec action_cmds[] =
{
{"Action", add_action, NULL, OR_FILEINFO, TAKE2,
"a media type followed by a script name"},
@@ -201,7 +201,7 @@
return OK;
}
-static handler_rec action_handlers[] =
+static const handler_rec action_handlers[] =
{
{"*/*", action_handler},
{NULL}
1.32 +1 -1 apache-1.3/src/modules/standard/mod_alias.c
Index: mod_alias.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_alias.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_alias.c 1998/03/12 10:29:02 1.31
+++ mod_alias.c 1998/03/13 19:20:28 1.32
@@ -221,7 +221,7 @@
return add_redirect_internal(cmd, dirconf, arg1, arg2, arg3, 1);
}
-static command_rec alias_cmds[] =
+static const command_rec alias_cmds[] =
{
{"Alias", add_alias, NULL, RSRC_CONF, TAKE2,
"a fakename and a realname"},
1.25 +1 -1 apache-1.3/src/modules/standard/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_asis.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_asis.c 1998/01/29 20:36:10 1.24
+++ mod_asis.c 1998/03/13 19:20:28 1.25
@@ -110,7 +110,7 @@
return OK;
}
-static handler_rec asis_handlers[] =
+static const handler_rec asis_handlers[] =
{
{ASIS_MAGIC_TYPE, asis_handler},
{"send-as-is", asis_handler},
1.33 +1 -1 apache-1.3/src/modules/standard/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_auth.c 1998/03/12 11:13:23 1.32
+++ mod_auth.c 1998/03/13 19:20:29 1.33
@@ -98,7 +98,7 @@
return set_file_slot(cmd, offset, f);
}
-static command_rec auth_cmds[] =
+static const command_rec auth_cmds[] =
{
{"AuthUserFile", set_auth_slot,
(void *) XtOffsetOf(auth_config_rec, auth_pwfile), OR_AUTHCFG, TAKE12,
1.31 +1 -1 apache-1.3/src/modules/standard/mod_auth_anon.c
Index: mod_auth_anon.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_anon.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_auth_anon.c 1998/03/12 11:03:01 1.30
+++ mod_auth_anon.c 1998/03/13 19:20:29 1.31
@@ -187,7 +187,7 @@
return NULL;
}
-static command_rec anon_auth_cmds[] =
+static const command_rec anon_auth_cmds[] =
{
{"Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, ITERATE,
"a space-separated list of user IDs"},
1.27 +1 -1 apache-1.3/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_auth_db.c 1998/01/07 16:46:44 1.26
+++ mod_auth_db.c 1998/03/13 19:20:30 1.27
@@ -113,7 +113,7 @@
return set_file_slot(cmd, offset, f);
}
-static command_rec db_auth_cmds[] =
+static const command_rec db_auth_cmds[] =
{
{"AuthDBUserFile", set_file_slot,
(void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
1.35 +1 -1 apache-1.3/src/modules/standard/mod_auth_dbm.c
Index: mod_auth_dbm.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_auth_dbm.c 1998/03/05 12:42:35 1.34
+++ mod_auth_dbm.c 1998/03/13 19:20:31 1.35
@@ -113,7 +113,7 @@
return set_file_slot(cmd, offset, f);
}
-static command_rec dbm_auth_cmds[] =
+static const command_rec dbm_auth_cmds[] =
{
{"AuthDBMUserFile", set_file_slot,
(void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
1.71 +2 -2 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mod_autoindex.c 1998/03/12 10:29:03 1.70
+++ mod_autoindex.c 1998/03/13 19:20:31 1.71
@@ -320,7 +320,7 @@
#define DIR_CMD_PERMS OR_INDEXES
-static command_rec autoindex_cmds[] =
+static const command_rec autoindex_cmds[] =
{
{"AddIcon", add_icon, BY_PATH, DIR_CMD_PERMS, ITERATE2,
"an icon URL followed by one or more filenames"},
@@ -1167,7 +1167,7 @@
}
-static handler_rec autoindex_handlers[] =
+static const handler_rec autoindex_handlers[] =
{
{DIR_MAGIC_TYPE, handle_autoindex},
{NULL}
1.26 +1 -1 apache-1.3/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_cern_meta.c 1998/03/12 10:29:03 1.25
+++ mod_cern_meta.c 1998/03/13 19:20:32 1.26
@@ -211,7 +211,7 @@
}
-static command_rec cern_meta_cmds[] =
+static const command_rec cern_meta_cmds[] =
{
{"MetaFiles", set_metafiles, NULL, DIR_CMD_PERMS, FLAG, NULL},
{"MetaDir", set_metadir, NULL, DIR_CMD_PERMS, TAKE1,
1.71 +2 -2 apache-1.3/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_cgi.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mod_cgi.c 1998/02/03 07:28:45 1.70
+++ mod_cgi.c 1998/03/13 19:20:32 1.71
@@ -148,7 +148,7 @@
return NULL;
}
-static command_rec cgi_cmds[] =
+static const command_rec cgi_cmds[] =
{
{"ScriptLog", set_scriptlog, NULL, RSRC_CONF, TAKE1,
"the name of a log for script debugging info"},
@@ -558,7 +558,7 @@
return OK; /* NOT r->status, even if it has
changed. */
}
-static handler_rec cgi_handlers[] =
+static const handler_rec cgi_handlers[] =
{
{CGI_MAGIC_TYPE, cgi_handler},
{"cgi-script", cgi_handler},
1.31 +1 -1 apache-1.3/src/modules/standard/mod_digest.c
Index: mod_digest.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_digest.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_digest.c 1998/01/07 16:46:47 1.30
+++ mod_digest.c 1998/03/13 19:20:33 1.31
@@ -91,7 +91,7 @@
return set_string_slot(cmd, offset, f);
}
-static command_rec digest_cmds[] =
+static const command_rec digest_cmds[] =
{
{"AuthDigestFile", set_digest_slot,
(void *) XtOffsetOf(digest_config_rec, pwfile), OR_AUTHCFG, TAKE12, NULL},
1.48 +2 -2 apache-1.3/src/modules/standard/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_dir.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mod_dir.c 1998/03/12 10:18:25 1.47
+++ mod_dir.c 1998/03/13 19:20:33 1.48
@@ -83,7 +83,7 @@
return NULL;
}
-static command_rec dir_cmds[] =
+static const command_rec dir_cmds[] =
{
{"DirectoryIndex", add_index, NULL,
DIR_CMD_PERMS, ITERATE,
@@ -212,7 +212,7 @@
}
-static handler_rec dir_handlers[] =
+static const handler_rec dir_handlers[] =
{
{DIR_MAGIC_TYPE, handle_dir},
{NULL}
1.21 +1 -1 apache-1.3/src/modules/standard/mod_env.c
Index: mod_env.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_env.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_env.c 1998/03/12 11:03:01 1.20
+++ mod_env.c 1998/03/13 19:20:34 1.21
@@ -219,7 +219,7 @@
return NULL;
}
-static command_rec env_module_cmds[] =
+static const command_rec env_module_cmds[] =
{
{"PassEnv", add_env_module_vars_passed, NULL,
RSRC_CONF, RAW_ARGS, "a list of environment variables to pass to CGI."},
1.24 +1 -1 apache-1.3/src/modules/standard/mod_expires.c
Index: mod_expires.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_expires.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_expires.c 1998/03/12 11:03:02 1.23
+++ mod_expires.c 1998/03/13 19:20:34 1.24
@@ -363,7 +363,7 @@
"'ExpiresDefault ", code, "': ", response, NULL);
}
-static command_rec expires_cmds[] =
+static const command_rec expires_cmds[] =
{
{"ExpiresActive", set_expiresactive, NULL, DIR_CMD_PERMS, FLAG,
"Limited to 'on' or 'off'"},
1.15 +1 -1 apache-1.3/src/modules/standard/mod_headers.c
Index: mod_headers.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_headers.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_headers.c 1998/03/12 11:13:24 1.14
+++ mod_headers.c 1998/03/13 19:20:35 1.15
@@ -191,7 +191,7 @@
return NULL;
}
-static command_rec headers_cmds[] =
+static const command_rec headers_cmds[] =
{
{"Header", header_cmd, NULL, OR_FILEINFO, TAKE23,
"an action, header and value"},
1.43 +2 -2 apache-1.3/src/modules/standard/mod_imap.c
Index: mod_imap.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_imap.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mod_imap.c 1998/03/01 00:31:50 1.42
+++ mod_imap.c 1998/03/13 19:20:36 1.43
@@ -144,7 +144,7 @@
}
-static command_rec imap_cmds[] =
+static const command_rec imap_cmds[] =
{
{"ImapMenu", set_string_slot,
(void *) XtOffsetOf(imap_conf_rec, imap_menu), OR_INDEXES, TAKE1,
@@ -881,7 +881,7 @@
}
-static handler_rec imap_handlers[] =
+static const handler_rec imap_handlers[] =
{
{IMAP_MAGIC_TYPE, imap_handler},
{"imap-file", imap_handler},
1.76 +2 -2 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mod_include.c 1998/03/12 10:29:04 1.75
+++ mod_include.c 1998/03/13 19:20:36 1.76
@@ -2363,13 +2363,13 @@
#endif
}
-static command_rec includes_cmds[] =
+static const command_rec includes_cmds[] =
{
{"XBitHack", set_xbithack, NULL, OR_OPTIONS, TAKE1, "Off, On, or Full"},
{NULL}
};
-static handler_rec includes_handlers[] =
+static const handler_rec includes_handlers[] =
{
{INCLUDES_MAGIC_TYPE, send_shtml_file},
{INCLUDES_MAGIC_TYPE3, send_shtml_file},
1.38 +6 -6 apache-1.3/src/modules/standard/mod_info.c
Index: mod_info.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_info.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_info.c 1998/03/04 02:28:23 1.37
+++ mod_info.c 1998/03/13 19:20:38 1.38
@@ -201,9 +201,9 @@
}
static void mod_info_module_cmds(request_rec *r, info_cfg_lines *cfg,
- command_rec *cmds, char *label)
+ const command_rec *cmds, char *label)
{
- command_rec *cmd = cmds;
+ const command_rec *cmd = cmds;
info_cfg_lines *li = cfg, *li_st = NULL, *li_se = NULL;
info_cfg_lines *block_start = NULL;
int lab = 0, nest = 0;
@@ -355,8 +355,8 @@
module *modp = NULL;
char buf[MAX_STRING_LEN], *cfname;
char *more_info;
- command_rec *cmd = NULL;
- handler_rec *hand = NULL;
+ const command_rec *cmd = NULL;
+ const handler_rec *hand = NULL;
server_rec *serv = r->server;
int comma = 0;
info_cfg_lines *mod_info_cfg_httpd = NULL;
@@ -653,14 +653,14 @@
return NULL;
}
-static command_rec info_cmds[] =
+static const command_rec info_cmds[] =
{
{"AddModuleInfo", add_module_info, NULL, RSRC_CONF, TAKE2,
"a module name and additional information on that module"},
{NULL}
};
-static handler_rec info_handlers[] =
+static const handler_rec info_handlers[] =
{
{"server-info", display_info},
{NULL}
1.21 +1 -1 apache-1.3/src/modules/standard/mod_log_agent.c
Index: mod_log_agent.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_agent.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_log_agent.c 1998/01/07 16:46:51 1.20
+++ mod_log_agent.c 1998/03/13 19:20:38 1.21
@@ -90,7 +90,7 @@
return NULL;
}
-static command_rec agent_log_cmds[] =
+static const command_rec agent_log_cmds[] =
{
{"AgentLog", set_agent_log, NULL, RSRC_CONF, TAKE1,
"the filename of the agent log"},
1.49 +1 -1 apache-1.3/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mod_log_config.c 1998/03/12 11:13:25 1.48
+++ mod_log_config.c 1998/03/13 19:20:39 1.49
@@ -878,7 +878,7 @@
return add_custom_log(cmd, dummy, fn, "%{Cookie}n \"%r\" %t");
}
-static command_rec config_log_cmds[] =
+static const command_rec config_log_cmds[] =
{
{"CustomLog", add_custom_log, NULL, RSRC_CONF, TAKE2,
"a file name and a custom log format string or format name"},
1.22 +1 -1 apache-1.3/src/modules/standard/mod_log_referer.c
Index: mod_log_referer.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_referer.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_log_referer.c 1998/03/12 11:03:03 1.21
+++ mod_log_referer.c 1998/03/13 19:20:39 1.22
@@ -103,7 +103,7 @@
return NULL;
}
-static command_rec referer_log_cmds[] =
+static const command_rec referer_log_cmds[] =
{
{"RefererLog", set_referer_log, NULL, RSRC_CONF, TAKE1,
"the filename of the referer log"},
1.35 +1 -1 apache-1.3/src/modules/standard/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_mime.c 1998/03/12 13:37:51 1.34
+++ mod_mime.c 1998/03/13 19:20:40 1.35
@@ -164,7 +164,7 @@
return NULL;
}
-static command_rec mime_cmds[] =
+static const command_rec mime_cmds[] =
{
{"AddType", add_type, NULL, OR_FILEINFO, ITERATE2,
"a mime type followed by one or more file extensions"},
1.28 +1 -1 apache-1.3/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_mime_magic.c 1998/03/12 10:29:05 1.27
+++ mod_mime_magic.c 1998/03/13 19:20:40 1.28
@@ -530,7 +530,7 @@
* configuration file commands - exported to Apache API
*/
-static command_rec mime_magic_cmds[] =
+static const command_rec mime_magic_cmds[] =
{
{"MimeMagicFile", set_magicfile, NULL, RSRC_CONF, TAKE1,
"Path to MIME Magic file (in file(1) format)"},
1.75 +2 -2 apache-1.3/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mod_negotiation.c 1998/03/12 11:36:09 1.74
+++ mod_negotiation.c 1998/03/13 19:20:41 1.75
@@ -138,7 +138,7 @@
return (get_module_config(s->module_config, &negotiation_module) !=
NULL);
}
-static command_rec negotiation_cmds[] =
+static const command_rec negotiation_cmds[] =
{
{"CacheNegotiatedDocs", cache_negotiated_docs, NULL, RSRC_CONF, NO_ARGS,
"no arguments (either present or absent)"},
@@ -2222,7 +2222,7 @@
return OK;
}
-static handler_rec negotiation_handlers[] =
+static const handler_rec negotiation_handlers[] =
{
{MAP_FILE_MAGIC_TYPE, handle_map_file},
{"type-map", handle_map_file},
1.93 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- mod_rewrite.c 1998/03/12 11:03:04 1.92
+++ mod_rewrite.c 1998/03/13 19:20:42 1.93
@@ -146,7 +146,7 @@
*/
/* the table of commands we provide */
-static command_rec command_table[] = {
+static const command_rec command_table[] = {
{ "RewriteEngine", cmd_rewriteengine, NULL, OR_FILEINFO, FLAG,
"On or Off to enable or disable (default) the whole rewriting engine"
},
{ "RewriteOptions", cmd_rewriteoptions, NULL, OR_FILEINFO, ITERATE,
@@ -170,7 +170,7 @@
};
/* the table of content handlers we provide */
-static handler_rec handler_table[] = {
+static const handler_rec handler_table[] = {
{ "redirect-handler", handler_redirect },
{ NULL }
};
1.18 +1 -1 apache-1.3/src/modules/standard/mod_setenvif.c
Index: mod_setenvif.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_setenvif.c 1998/03/12 11:13:26 1.17
+++ mod_setenvif.c 1998/03/13 19:20:43 1.18
@@ -245,7 +245,7 @@
return add_setenvif_core(cmd, mconfig, "User-Agent", args);
}
-static command_rec setenvif_module_cmds[] =
+static const command_rec setenvif_module_cmds[] =
{
{"SetEnvIf", add_setenvif, NULL,
RSRC_CONF, RAW_ARGS, "A header-name, regex and a list of variables."},
1.11 +1 -1 apache-1.3/src/modules/standard/mod_so.c
Index: mod_so.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_so.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_so.c 1998/03/13 13:28:21 1.10
+++ mod_so.c 1998/03/13 19:20:44 1.11
@@ -353,7 +353,7 @@
#endif /* NO_DLOPEN */
-static command_rec so_cmds[] = {
+static const command_rec so_cmds[] = {
{ "LoadModule", load_module, NULL, RSRC_CONF, TAKE2,
"a module name, and the name of a shared object file to load it from"},
{ "LoadFile", load_file, NULL, RSRC_CONF, ITERATE,
1.16 +1 -1 apache-1.3/src/modules/standard/mod_speling.c
Index: mod_speling.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_speling.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_speling.c 1998/03/12 18:17:15 1.15
+++ mod_speling.c 1998/03/13 19:20:45 1.16
@@ -98,7 +98,7 @@
return NULL;
}
-static command_rec speling_cmds[] =
+static const command_rec speling_cmds[] =
{
{"CheckSpelling", set_speling, NULL, RSRC_CONF, FLAG,
"whether or not to fix miscapitalized/misspelled requests"},
1.78 +1 -1 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mod_status.c 1998/03/04 02:28:24 1.77
+++ mod_status.c 1998/03/13 19:20:46 1.78
@@ -672,7 +672,7 @@
status_flags[SERVER_GRACEFUL] = 'G';
}
-static handler_rec status_handlers[] =
+static const handler_rec status_handlers[] =
{
{STATUS_MAGIC_TYPE, status_handler},
{"server-status", status_handler},
1.32 +1 -1 apache-1.3/src/modules/standard/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_userdir.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_userdir.c 1998/03/12 11:13:26 1.31
+++ mod_userdir.c 1998/03/13 19:20:46 1.32
@@ -181,7 +181,7 @@
return NULL;
}
-static command_rec userdir_cmds[] = {
+static const command_rec userdir_cmds[] = {
{"UserDir", set_user_dir, NULL, RSRC_CONF, RAW_ARGS,
"the public subdirectory in users' home directories, or 'disabled', or
'disabled username username...', or 'enabled username username...'"},
{NULL}
1.29 +1 -1 apache-1.3/src/modules/standard/mod_usertrack.c
Index: mod_usertrack.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_usertrack.c 1998/03/12 11:03:07 1.28
+++ mod_usertrack.c 1998/03/13 19:20:47 1.29
@@ -316,7 +316,7 @@
return NULL;
}
-static command_rec cookie_log_cmds[] = {
+static const command_rec cookie_log_cmds[] = {
{"CookieExpires", set_cookie_exp, NULL, RSRC_CONF, TAKE1,
"an expiry date code"},
{"CookieTracking", set_cookie_enable, NULL, OR_FILEINFO, FLAG,
1.3 +1 -1 apache-1.3/src/modules/test/mod_rndchunk.c
Index: mod_rndchunk.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/mod_rndchunk.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_rndchunk.c 1998/03/10 09:41:27 1.2
+++ mod_rndchunk.c 1998/03/13 19:20:58 1.3
@@ -149,7 +149,7 @@
return 0;
}
-static handler_rec rndchunk_handlers[] =
+static const handler_rec rndchunk_handlers[] =
{
{"rndchunk", send_rndchunk},
{NULL}
1.3 +1 -1 apache-1.3/src/modules/test/mod_test_util_uri.c
Index: mod_test_util_uri.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/mod_test_util_uri.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_test_util_uri.c 1998/03/03 08:21:54 1.2
+++ mod_test_util_uri.c 1998/03/13 19:20:58 1.3
@@ -323,7 +323,7 @@
return OK;
}
-static handler_rec test_util_uri_handlers[] =
+static const handler_rec test_util_uri_handlers[] =
{
{"test-util-uri", test_util_uri},
{NULL}
