1 diff -Nru apache_1.3.12/src/modules/standard/mod_auth_db.c apache_1.3.12.new/src/modules/standard/mod_auth_db.c
2 --- apache_1.3.12/src/modules/standard/mod_auth_db.c Sun Nov 28 13:59:51 1999
3 +++ apache_1.3.12.new/src/modules/standard/mod_auth_db.c Sun Apr 2 23:51:16 2000
5 * instead of AuthDBMUserFile AuthDBMGroupFile
7 * Also, in the configuration file you need to specify
8 - * db_auth_module rather than dbm_auth_module
9 + * auth_db_module rather than auth_dbm_module
11 * On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically
12 * mapped to Berkeley DB. You can use either mod_auth_dbm or
16 int auth_dbauthoritative;
17 -} db_auth_config_rec;
18 +} auth_db_config_rec;
20 -static void *create_db_auth_dir_config(pool *p, char *d)
21 +static void *create_auth_db_dir_config(pool *p, char *d)
23 - db_auth_config_rec *sec
24 - = (db_auth_config_rec *) ap_pcalloc(p, sizeof(db_auth_config_rec));
25 + auth_db_config_rec *sec
26 + = (auth_db_config_rec *) ap_pcalloc(p, sizeof(auth_db_config_rec));
27 sec->auth_dbpwfile = NULL;
28 sec->auth_dbgrpfile = NULL;
29 sec->auth_dbauthoritative = 1; /* fortress is secure by default */
31 return ap_set_file_slot(cmd, offset, f);
34 -static const command_rec db_auth_cmds[] =
35 +static const command_rec auth_db_cmds[] =
37 {"AuthDBUserFile", ap_set_file_slot,
38 - (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
39 + (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile),
40 OR_AUTHCFG, TAKE1, NULL},
41 {"AuthDBGroupFile", ap_set_file_slot,
42 - (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
43 + (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile),
44 OR_AUTHCFG, TAKE1, NULL},
45 {"AuthUserFile", set_db_slot,
46 - (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
47 + (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile),
48 OR_AUTHCFG, TAKE12, NULL},
49 {"AuthGroupFile", set_db_slot,
50 - (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
51 + (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile),
52 OR_AUTHCFG, TAKE12, NULL},
53 {"AuthDBAuthoritative", ap_set_flag_slot,
54 - (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
55 + (void *) XtOffsetOf(auth_db_config_rec, auth_dbauthoritative),
57 "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"},
61 -module db_auth_module;
62 +module auth_db_module;
64 static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
70 -static int db_authenticate_basic_user(request_rec *r)
71 +static int authenticate_db_basic_user(request_rec *r)
73 - db_auth_config_rec *sec =
74 - (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
76 + auth_db_config_rec *sec =
77 + (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
79 conn_rec *c = r->connection;
81 char *real_pw, *colon_pw;
84 static int db_check_auth(request_rec *r)
86 - db_auth_config_rec *sec =
87 - (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
89 + auth_db_config_rec *sec =
90 + (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
92 char *user = r->connection->user;
93 int m = r->method_number;
99 -module db_auth_module =
100 +module auth_db_module =
102 STANDARD_MODULE_STUFF,
103 NULL, /* initializer */
104 - create_db_auth_dir_config, /* dir config creater */
105 + create_auth_db_dir_config, /* dir config creater */
106 NULL, /* dir merger --- default is to override */
107 NULL, /* server config */
108 NULL, /* merge server config */
109 - db_auth_cmds, /* command table */
110 + auth_db_cmds, /* command table */
112 NULL, /* filename translation */
113 - db_authenticate_basic_user, /* check_user_id */
114 + authenticate_db_basic_user, /* check_user_id */
115 db_check_auth, /* check auth */
116 NULL, /* check access */
117 NULL, /* type_checker */
118 diff -Nru apache_1.3.12/src/modules/standard/mod_include.c apache_1.3.12.new/src/modules/standard/mod_include.c
119 --- apache_1.3.12/src/modules/standard/mod_include.c Wed Feb 2 21:44:03 2000
120 +++ apache_1.3.12.new/src/modules/standard/mod_include.c Sun Apr 2 23:31:33 2000
122 #define RAW_ASCII_CHAR(ch) (ch)
123 #endif /*CHARSET_EBCDIC*/
125 -module MODULE_VAR_EXPORT includes_module;
126 +module MODULE_VAR_EXPORT include_module;
128 /* ------------------------ Environment function -------------------------- */
132 /* see the Kludge in send_parsed_file for why */
134 - ap_set_module_config(rr->request_config, &includes_module, r);
135 + ap_set_module_config(rr->request_config, &include_module, r);
137 if (!error_fmt && ap_run_sub_req(rr)) {
138 error_fmt = "unable to include \"%s\" in parsed file %s";
139 @@ -2306,7 +2306,7 @@
140 * option only changes the default.
143 -module includes_module;
144 +module include_module;
146 xbithack_off, xbithack_on, xbithack_full
148 @@ -2317,7 +2317,7 @@
149 #define DEFAULT_XBITHACK xbithack_off
152 -static void *create_includes_dir_config(pool *p, char *dummy)
153 +static void *create_include_dir_config(pool *p, char *dummy)
155 enum xbithack *result = (enum xbithack *) ap_palloc(p, sizeof(enum xbithack));
156 *result = DEFAULT_XBITHACK;
157 @@ -2348,7 +2348,7 @@
160 enum xbithack *state =
161 - (enum xbithack *) ap_get_module_config(r->per_dir_config, &includes_module);
162 + (enum xbithack *) ap_get_module_config(r->per_dir_config, &include_module);
166 @@ -2419,7 +2419,7 @@
168 if (ap_table_get(q->notes, PARENT_STRING)) {
169 /* Kludge --- See below */
170 - ap_set_module_config(r->request_config, &includes_module, q);
171 + ap_set_module_config(r->request_config, &include_module, q);
173 /* Create the initial environment in the parent */
174 ap_add_common_vars(q);
175 @@ -2441,7 +2441,7 @@
179 - if ((parent = ap_get_module_config(r->request_config, &includes_module))) {
180 + if ((parent = ap_get_module_config(r->request_config, &include_module))) {
181 /* Kludge --- for nested includes, we want to keep the subprocess
182 * environment of the base document (for compatibility); that means
183 * torquing our own last_modified date as well so that the
184 @@ -2511,7 +2511,7 @@
187 state = (enum xbithack *) ap_get_module_config(r->per_dir_config,
191 if (*state == xbithack_off) {
193 @@ -2520,13 +2520,13 @@
197 -static const command_rec includes_cmds[] =
198 +static const command_rec include_cmds[] =
200 {"XBitHack", set_xbithack, NULL, OR_OPTIONS, TAKE1, "Off, On, or Full"},
204 -static const handler_rec includes_handlers[] =
205 +static const handler_rec include_handlers[] =
207 {INCLUDES_MAGIC_TYPE, send_shtml_file},
208 {INCLUDES_MAGIC_TYPE3, send_shtml_file},
209 @@ -2535,16 +2535,16 @@
213 -module MODULE_VAR_EXPORT includes_module =
214 +module MODULE_VAR_EXPORT include_module =
216 STANDARD_MODULE_STUFF,
217 NULL, /* initializer */
218 - create_includes_dir_config, /* dir config creater */
219 + create_include_dir_config, /* dir config creater */
220 NULL, /* dir merger --- default is to override */
221 NULL, /* server config */
222 NULL, /* merge server config */
223 - includes_cmds, /* command table */
224 - includes_handlers, /* handlers */
225 + include_cmds, /* command table */
226 + include_handlers, /* handlers */
227 NULL, /* filename translation */
228 NULL, /* check_user_id */
229 NULL, /* check auth */
230 diff -Nru apache_1.3.12/src/modules/standard/mod_auth_dbm.c apache_1.3.12.new/src/modules/standard/mod_auth_dbm.c
231 --- apache_1.3.12/src/modules/standard/mod_auth_dbm.c Mon Aug 2 22:50:22 1999
232 +++ apache_1.3.12.new/src/modules/standard/mod_auth_dbm.c Mon Apr 3 00:15:09 2000
236 * MODULE-DEFINITION-START
237 - * Name: dbm_auth_module
238 + * Name: auth_dbm_module
240 . ./helpers/find-dbm-lib
242 @@ -100,12 +100,12 @@
243 char *auth_dbmgrpfile;
244 int auth_dbmauthoritative;
246 -} dbm_auth_config_rec;
247 +} auth_dbm_config_rec;
249 -static void *create_dbm_auth_dir_config(pool *p, char *d)
250 +static void *create_auth_dbm_dir_config(pool *p, char *d)
252 - dbm_auth_config_rec *sec
253 - = (dbm_auth_config_rec *) ap_pcalloc(p, sizeof(dbm_auth_config_rec));
254 + auth_dbm_config_rec *sec
255 + = (auth_dbm_config_rec *) ap_pcalloc(p, sizeof(auth_dbm_config_rec));
257 sec->auth_dbmpwfile = NULL;
258 sec->auth_dbmgrpfile = NULL;
259 @@ -122,27 +122,27 @@
260 return ap_set_file_slot(cmd, offset, f);
263 -static const command_rec dbm_auth_cmds[] =
264 +static const command_rec auth_dbm_cmds[] =
266 {"AuthDBMUserFile", ap_set_file_slot,
267 - (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
268 + (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile),
269 OR_AUTHCFG, TAKE1, NULL},
270 {"AuthDBMGroupFile", ap_set_file_slot,
271 - (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
272 + (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile),
273 OR_AUTHCFG, TAKE1, NULL},
274 {"AuthUserFile", set_dbm_slot,
275 - (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
276 + (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile),
277 OR_AUTHCFG, TAKE12, NULL},
278 {"AuthGroupFile", set_dbm_slot,
279 - (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
280 + (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile),
281 OR_AUTHCFG, TAKE12, NULL},
282 {"AuthDBMAuthoritative", ap_set_flag_slot,
283 - (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
284 + (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmauthoritative),
285 OR_AUTHCFG, FLAG, "Set to 'no' to allow access control to be passed along to lower modules, if the UserID is not known in this module"},
289 -module dbm_auth_module;
290 +module auth_dbm_module;
292 static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
294 @@ -205,11 +205,11 @@
298 -static int dbm_authenticate_basic_user(request_rec *r)
299 +static int authenticate_dbm_basic_user(request_rec *r)
301 - dbm_auth_config_rec *sec =
302 - (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
304 + auth_dbm_config_rec *sec =
305 + (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
307 conn_rec *c = r->connection;
309 char *real_pw, *colon_pw;
312 static int dbm_check_auth(request_rec *r)
314 - dbm_auth_config_rec *sec =
315 - (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
317 + auth_dbm_config_rec *sec =
318 + (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
320 char *user = r->connection->user;
321 int m = r->method_number;
323 @@ -311,18 +311,18 @@
327 -module dbm_auth_module =
328 +module auth_dbm_module =
330 STANDARD_MODULE_STUFF,
331 NULL, /* initializer */
332 - create_dbm_auth_dir_config, /* dir config creater */
333 + create_auth_dbm_dir_config, /* dir config creater */
334 NULL, /* dir merger --- default is to override */
335 NULL, /* server config */
336 NULL, /* merge server config */
337 - dbm_auth_cmds, /* command table */
338 + auth_dbm_cmds, /* command table */
340 NULL, /* filename translation */
341 - dbm_authenticate_basic_user, /* check_user_id */
342 + authenticate_dbm_basic_user, /* check_user_id */
343 dbm_check_auth, /* check auth */
344 NULL, /* check access */
345 NULL, /* type_checker */
346 diff -Nru apache_1.3.12/src/modules/standard/mod_log_agent.c apache_1.3.12.new/src/modules/standard/mod_log_agent.c
347 --- apache_1.3.12/src/modules/standard/mod_log_agent.c Fri Jan 1 20:05:10 1999
348 +++ apache_1.3.12.new/src/modules/standard/mod_log_agent.c Mon Apr 3 00:21:51 2000
350 #include "http_config.h"
351 #include "http_log.h"
353 -module agent_log_module;
354 +module log_agent_module;
356 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
365 -static void *make_agent_log_state(pool *p, server_rec *s)
366 +static void *make_log_agent_state(pool *p, server_rec *s)
368 - agent_log_state *cls =
369 - (agent_log_state *) ap_palloc(p, sizeof(agent_log_state));
370 + log_agent_state *cls =
371 + (log_agent_state *) ap_palloc(p, sizeof(log_agent_state));
379 -static const char *set_agent_log(cmd_parms *parms, void *dummy, char *arg)
380 +static const char *set_log_agent(cmd_parms *parms, void *dummy, char *arg)
382 - agent_log_state *cls = ap_get_module_config(parms->server->module_config,
383 - &agent_log_module);
384 + log_agent_state *cls = ap_get_module_config(parms->server->module_config,
385 + &log_agent_module);
391 -static const command_rec agent_log_cmds[] =
392 +static const command_rec log_agent_cmds[] =
394 - {"AgentLog", set_agent_log, NULL, RSRC_CONF, TAKE1,
395 + {"AgentLog", set_log_agent, NULL, RSRC_CONF, TAKE1,
396 "the filename of the agent log"},
400 -static void open_agent_log(server_rec *s, pool *p)
401 +static void open_log_agent(server_rec *s, pool *p)
403 - agent_log_state *cls = ap_get_module_config(s->module_config,
404 - &agent_log_module);
405 + log_agent_state *cls = ap_get_module_config(s->module_config,
406 + &log_agent_module);
408 char *fname = ap_server_root_relative(p, cls->fname);
410 @@ -132,16 +132,16 @@
414 -static void init_agent_log(server_rec *s, pool *p)
415 +static void init_log_agent(server_rec *s, pool *p)
417 for (; s; s = s->next)
418 - open_agent_log(s, p);
419 + open_log_agent(s, p);
422 -static int agent_log_transaction(request_rec *orig)
423 +static int log_agent_transaction(request_rec *orig)
425 - agent_log_state *cls = ap_get_module_config(orig->server->module_config,
426 - &agent_log_module);
427 + log_agent_state *cls = ap_get_module_config(orig->server->module_config,
428 + &log_agent_module);
430 char str[HUGE_STRING_LEN];
432 @@ -164,15 +164,15 @@
436 -module agent_log_module =
437 +module log_agent_module =
439 STANDARD_MODULE_STUFF,
440 - init_agent_log, /* initializer */
441 + init_log_agent, /* initializer */
442 NULL, /* create per-dir config */
443 NULL, /* merge per-dir config */
444 - make_agent_log_state, /* server config */
445 + make_log_agent_state, /* server config */
446 NULL, /* merge server config */
447 - agent_log_cmds, /* command table */
448 + log_agent_cmds, /* command table */
450 NULL, /* filename translation */
451 NULL, /* check_user_id */
453 NULL, /* check access */
454 NULL, /* type_checker */
456 - agent_log_transaction, /* logger */
457 + log_agent_transaction, /* logger */
458 NULL, /* header parser */
459 NULL, /* child_init */
460 NULL, /* child_exit */
461 diff -Nru apache_1.3.12/src/modules/standard/mod_log_config.c apache_1.3.12.new/src/modules/standard/mod_log_config.c
462 --- apache_1.3.12/src/modules/standard/mod_log_config.c Mon Apr 3 00:26:44 2000
463 +++ apache_1.3.12.new/src/modules/standard/mod_log_config.c Mon Apr 3 00:24:40 2000
465 #include "http_log.h"
468 -module MODULE_VAR_EXPORT config_log_module;
469 +module MODULE_VAR_EXPORT log_config_module;
471 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
472 #if defined(OS2) || defined(WIN32)
473 @@ -207,29 +207,29 @@
476 * multi_log_state is our per-(virtual)-server configuration. We store
477 - * an array of the logs we are going to use, each of type config_log_state.
478 + * an array of the logs we are going to use, each of type log_config_state.
479 * If a default log format is given by LogFormat, store in default_format
480 * (backward compat. with mod_log_config). We also store for each virtual
481 * server a pointer to the logs specified for the main server, so that if this
482 * vhost has no logs defined, we can use the main server's logs instead.
484 - * So, for the main server, config_logs contains a list of the log files
485 - * and server_config_logs in empty. For a vhost, server_config_logs
486 - * points to the same array as config_logs in the main server, and
487 - * config_logs points to the array of logs defined inside this vhost,
488 + * So, for the main server, log_configs contains a list of the log files
489 + * and server_log_configs in empty. For a vhost, server_log_configs
490 + * points to the same array as log_configs in the main server, and
491 + * log_configs points to the array of logs defined inside this vhost,
492 * which might be empty.
496 char *default_format_string;
497 array_header *default_format;
498 - array_header *config_logs;
499 - array_header *server_config_logs;
500 + array_header *log_configs;
501 + array_header *server_log_configs;
506 - * config_log_state holds the status of a single log file. fname might
507 + * log_config_state holds the status of a single log file. fname might
508 * be NULL, which means this module does no logging for this
509 * request. format might be NULL, in which case the default_format
510 * from the multi_log_state should be used, or if that is NULL as
513 char outbuf[LOG_BUFSIZE];
524 -static void flush_log(config_log_state *cls)
525 +static void flush_log(log_config_state *cls)
527 if (cls->outcnt && cls->log_fd != -1) {
528 write(cls->log_fd, cls->outbuf, cls->outcnt);
533 -static int config_log_transaction(request_rec *r, config_log_state *cls,
534 +static int log_config_transaction(request_rec *r, log_config_state *cls,
535 array_header *default_format)
537 log_format_item *items;
538 @@ -905,27 +905,27 @@
539 static int multi_log_transaction(request_rec *r)
541 multi_log_state *mls = ap_get_module_config(r->server->module_config,
542 - &config_log_module);
543 - config_log_state *clsarray;
544 + &log_config_module);
545 + log_config_state *clsarray;
549 * Log this transaction..
551 - if (mls->config_logs->nelts) {
552 - clsarray = (config_log_state *) mls->config_logs->elts;
553 - for (i = 0; i < mls->config_logs->nelts; ++i) {
554 - config_log_state *cls = &clsarray[i];
555 + if (mls->log_configs->nelts) {
556 + clsarray = (log_config_state *) mls->log_configs->elts;
557 + for (i = 0; i < mls->log_configs->nelts; ++i) {
558 + log_config_state *cls = &clsarray[i];
560 - config_log_transaction(r, cls, mls->default_format);
561 + log_config_transaction(r, cls, mls->default_format);
564 - else if (mls->server_config_logs) {
565 - clsarray = (config_log_state *) mls->server_config_logs->elts;
566 - for (i = 0; i < mls->server_config_logs->nelts; ++i) {
567 - config_log_state *cls = &clsarray[i];
568 + else if (mls->server_log_configs) {
569 + clsarray = (log_config_state *) mls->server_log_configs->elts;
570 + for (i = 0; i < mls->server_log_configs->nelts; ++i) {
571 + log_config_state *cls = &clsarray[i];
573 - config_log_transaction(r, cls, mls->default_format);
574 + log_config_transaction(r, cls, mls->default_format);
578 @@ -937,15 +937,15 @@
582 -static void *make_config_log_state(pool *p, server_rec *s)
583 +static void *make_log_config_state(pool *p, server_rec *s)
585 multi_log_state *mls;
587 mls = (multi_log_state *) ap_palloc(p, sizeof(multi_log_state));
588 - mls->config_logs = ap_make_array(p, 1, sizeof(config_log_state));
589 + mls->log_configs = ap_make_array(p, 1, sizeof(log_config_state));
590 mls->default_format_string = NULL;
591 mls->default_format = NULL;
592 - mls->server_config_logs = NULL;
593 + mls->server_log_configs = NULL;
594 mls->formats = ap_make_table(p, 4);
595 ap_table_setn(mls->formats, "CLF", DEFAULT_LOG_FORMAT);
597 @@ -958,12 +958,12 @@
598 * vhosts inherit any globally-defined format names.
601 -static void *merge_config_log_state(pool *p, void *basev, void *addv)
602 +static void *merge_log_config_state(pool *p, void *basev, void *addv)
604 multi_log_state *base = (multi_log_state *) basev;
605 multi_log_state *add = (multi_log_state *) addv;
607 - add->server_config_logs = base->config_logs;
608 + add->server_log_configs = base->log_configs;
609 if (!add->default_format) {
610 add->default_format_string = base->default_format_string;
611 add->default_format = base->default_format;
614 const char *err_string = NULL;
615 multi_log_state *mls = ap_get_module_config(cmd->server->module_config,
616 - &config_log_module);
617 + &log_config_module);
620 * If we were given two arguments, the second is a name to be given to the
621 @@ -1007,10 +1007,10 @@
623 const char *err_string = NULL;
624 multi_log_state *mls = ap_get_module_config(cmd->server->module_config,
625 - &config_log_module);
626 - config_log_state *cls;
627 + &log_config_module);
628 + log_config_state *cls;
630 - cls = (config_log_state *) ap_push_array(mls->config_logs);
631 + cls = (log_config_state *) ap_push_array(mls->log_configs);
632 cls->condition_var = NULL;
633 if (envclause != NULL) {
634 if (strncasecmp(envclause, "env=", 4) != 0) {
635 @@ -1046,7 +1046,7 @@
636 return add_custom_log(cmd, dummy, fn, "%{Cookie}n \"%r\" %t", NULL);
639 -static const command_rec config_log_cmds[] =
640 +static const command_rec log_config_cmds[] =
642 {"CustomLog", add_custom_log, NULL, RSRC_CONF, TAKE23,
643 "a file name, a custom log format string or format name, "
644 @@ -1060,8 +1060,8 @@
648 -static config_log_state *open_config_log(server_rec *s, pool *p,
649 - config_log_state *cls,
650 +static log_config_state *open_log_config(server_rec *s, pool *p,
651 + log_config_state *cls,
652 array_header *default_format)
654 if (cls->log_fd > 0) {
655 @@ -1096,12 +1096,12 @@
659 -static config_log_state *open_multi_logs(server_rec *s, pool *p)
660 +static log_config_state *open_multi_logs(server_rec *s, pool *p)
663 multi_log_state *mls = ap_get_module_config(s->module_config,
664 - &config_log_module);
665 - config_log_state *clsarray;
666 + &log_config_module);
667 + log_config_state *clsarray;
671 @@ -1116,10 +1116,10 @@
672 mls->default_format = parse_log_string(p, DEFAULT_LOG_FORMAT, &dummy);
675 - if (mls->config_logs->nelts) {
676 - clsarray = (config_log_state *) mls->config_logs->elts;
677 - for (i = 0; i < mls->config_logs->nelts; ++i) {
678 - config_log_state *cls = &clsarray[i];
679 + if (mls->log_configs->nelts) {
680 + clsarray = (log_config_state *) mls->log_configs->elts;
681 + for (i = 0; i < mls->log_configs->nelts; ++i) {
682 + log_config_state *cls = &clsarray[i];
684 if (cls->format_string) {
685 format = ap_table_get(mls->formats, cls->format_string);
686 @@ -1128,13 +1128,13 @@
690 - cls = open_config_log(s, p, cls, mls->default_format);
691 + cls = open_log_config(s, p, cls, mls->default_format);
694 - else if (mls->server_config_logs) {
695 - clsarray = (config_log_state *) mls->server_config_logs->elts;
696 - for (i = 0; i < mls->server_config_logs->nelts; ++i) {
697 - config_log_state *cls = &clsarray[i];
698 + else if (mls->server_log_configs) {
699 + clsarray = (log_config_state *) mls->server_log_configs->elts;
700 + for (i = 0; i < mls->server_log_configs->nelts; ++i) {
701 + log_config_state *cls = &clsarray[i];
703 if (cls->format_string) {
704 format = ap_table_get(mls->formats, cls->format_string);
705 @@ -1143,14 +1143,14 @@
709 - cls = open_config_log(s, p, cls, mls->default_format);
710 + cls = open_log_config(s, p, cls, mls->default_format);
717 -static void init_config_log(server_rec *s, pool *p)
718 +static void init_log_config(server_rec *s, pool *p)
720 /* First, do "physical" server, which gets default log fd and format
721 * for the virtual servers, if they don't override...
722 @@ -1170,20 +1170,20 @@
724 multi_log_state *mls;
725 array_header *log_list;
726 - config_log_state *clsarray;
727 + log_config_state *clsarray;
730 for (; s; s = s->next) {
731 - mls = ap_get_module_config(s->module_config, &config_log_module);
732 + mls = ap_get_module_config(s->module_config, &log_config_module);
734 - if (mls->config_logs->nelts) {
735 - log_list = mls->config_logs;
736 + if (mls->log_configs->nelts) {
737 + log_list = mls->log_configs;
739 - else if (mls->server_config_logs) {
740 - log_list = mls->server_config_logs;
741 + else if (mls->server_log_configs) {
742 + log_list = mls->server_log_configs;
745 - clsarray = (config_log_state *) log_list->elts;
746 + clsarray = (log_config_state *) log_list->elts;
747 for (i = 0; i < log_list->nelts; ++i) {
748 flush_log(&clsarray[i]);
750 @@ -1192,15 +1192,15 @@
754 -module MODULE_VAR_EXPORT config_log_module =
755 +module MODULE_VAR_EXPORT log_config_module =
757 STANDARD_MODULE_STUFF,
758 - init_config_log, /* initializer */
759 + init_log_config, /* initializer */
760 NULL, /* create per-dir config */
761 NULL, /* merge per-dir config */
762 - make_config_log_state, /* server config */
763 - merge_config_log_state, /* merge server config */
764 - config_log_cmds, /* command table */
765 + make_log_config_state, /* server config */
766 + merge_log_config_state, /* merge server config */
767 + log_config_cmds, /* command table */
769 NULL, /* filename translation */
770 NULL, /* check_user_id */
771 diff -Nru apache_1.3.12/src/modules/standard/mod_log_referer.c apache_1.3.12.new/src/modules/standard/mod_log_referer.c
772 --- apache_1.3.12/src/modules/standard/mod_log_referer.c Fri Jan 1 20:05:11 1999
773 +++ apache_1.3.12.new/src/modules/standard/mod_log_referer.c Mon Apr 3 00:44:02 2000
775 #include "http_config.h"
776 #include "http_log.h"
778 -module referer_log_module;
779 +module log_referer_module;
781 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
786 array_header *referer_ignore_list;
787 -} referer_log_state;
788 +} log_referer_state;
790 -static void *make_referer_log_state(pool *p, server_rec *s)
791 +static void *make_log_referer_state(pool *p, server_rec *s)
793 - referer_log_state *cls =
794 - (referer_log_state *) ap_palloc(p, sizeof(referer_log_state));
795 + log_referer_state *cls =
796 + (log_referer_state *) ap_palloc(p, sizeof(log_referer_state));
799 cls->referer_fd = -1;
804 -static const char *set_referer_log(cmd_parms *parms, void *dummy, char *arg)
805 +static const char *set_log_referer(cmd_parms *parms, void *dummy, char *arg)
807 - referer_log_state *cls = ap_get_module_config(parms->server->module_config,
808 - &referer_log_module);
809 + log_referer_state *cls = ap_get_module_config(parms->server->module_config,
810 + &log_referer_module);
815 static const char *add_referer_ignore(cmd_parms *parms, void *dummy, char *arg)
818 - referer_log_state *cls = ap_get_module_config(parms->server->module_config,
819 - &referer_log_module);
820 + log_referer_state *cls = ap_get_module_config(parms->server->module_config,
821 + &log_referer_module);
823 addme = ap_push_array(cls->referer_ignore_list);
825 @@ -109,19 +109,19 @@
829 -static const command_rec referer_log_cmds[] =
830 +static const command_rec log_referer_cmds[] =
832 - {"RefererLog", set_referer_log, NULL, RSRC_CONF, TAKE1,
833 + {"RefererLog", set_log_referer, NULL, RSRC_CONF, TAKE1,
834 "the filename of the referer log"},
835 {"RefererIgnore", add_referer_ignore, NULL, RSRC_CONF, ITERATE,
836 "referer hostnames to ignore"},
840 -static void open_referer_log(server_rec *s, pool *p)
841 +static void open_log_referer(server_rec *s, pool *p)
843 - referer_log_state *cls = ap_get_module_config(s->module_config,
844 - &referer_log_module);
845 + log_referer_state *cls = ap_get_module_config(s->module_config,
846 + &log_referer_module);
848 char *fname = ap_server_root_relative(p, cls->fname);
850 @@ -149,17 +149,17 @@
854 -static void init_referer_log(server_rec *s, pool *p)
855 +static void init_log_referer(server_rec *s, pool *p)
857 for (; s; s = s->next)
858 - open_referer_log(s, p);
859 + open_log_referer(s, p);
862 -static int referer_log_transaction(request_rec *orig)
863 +static int log_referer_transaction(request_rec *orig)
865 char **ptrptr, **ptrptr2;
866 - referer_log_state *cls = ap_get_module_config(orig->server->module_config,
867 - &referer_log_module);
868 + log_referer_state *cls = ap_get_module_config(orig->server->module_config,
869 + &log_referer_module);
873 @@ -205,15 +205,15 @@
877 -module referer_log_module =
878 +module log_referer_module =
880 STANDARD_MODULE_STUFF,
881 - init_referer_log, /* initializer */
882 + init_log_referer, /* initializer */
883 NULL, /* create per-dir config */
884 NULL, /* merge per-dir config */
885 - make_referer_log_state, /* server config */
886 + make_log_referer_state, /* server config */
887 NULL, /* merge server config */
888 - referer_log_cmds, /* command table */
889 + log_referer_cmds, /* command table */
891 NULL, /* filename translation */
892 NULL, /* check_user_id */
894 NULL, /* check access */
895 NULL, /* type_checker */
897 - referer_log_transaction, /* logger */
898 + log_referer_transaction, /* logger */
899 NULL, /* header parser */
900 NULL, /* child_init */
901 NULL, /* child_exit */
902 diff -Nru apache_1.3.12/src/modules/standard/mod_actions.c apache_1.3.12.new/src/modules/standard/mod_actions.c
903 --- apache_1.3.12/src/modules/standard/mod_actions.c Wed Feb 2 21:44:00 2000
904 +++ apache_1.3.12.new/src/modules/standard/mod_actions.c Mon Apr 3 00:47:35 2000
906 * track extension method mappings -- table keys are case-INsensitive.
909 - table *action_types; /* Added with Action... */
910 + table *actions_types; /* Added with Action... */
911 char *scripted[METHODS]; /* Added with Script... */
912 array_header *xmethods; /* Added with Script -- extension methods */
913 -} action_dir_config;
914 +} actions_dir_config;
916 -module action_module;
917 +module actions_module;
919 -static void *create_action_dir_config(pool *p, char *dummy)
920 +static void *create_actions_dir_config(pool *p, char *dummy)
922 - action_dir_config *new =
923 - (action_dir_config *) ap_palloc(p, sizeof(action_dir_config));
924 + actions_dir_config *new =
925 + (actions_dir_config *) ap_palloc(p, sizeof(actions_dir_config));
927 - new->action_types = ap_make_table(p, 4);
928 + new->actions_types = ap_make_table(p, 4);
929 memset(new->scripted, 0, sizeof(new->scripted));
930 new->xmethods = ap_make_array(p, 4, sizeof(xmethod_t));
934 -static void *merge_action_dir_configs(pool *p, void *basev, void *addv)
935 +static void *merge_actions_dir_configs(pool *p, void *basev, void *addv)
937 - action_dir_config *base = (action_dir_config *) basev;
938 - action_dir_config *add = (action_dir_config *) addv;
939 - action_dir_config *new = (action_dir_config *) ap_palloc(p,
940 - sizeof(action_dir_config));
941 + actions_dir_config *base = (actions_dir_config *) basev;
942 + actions_dir_config *add = (actions_dir_config *) addv;
943 + actions_dir_config *new = (actions_dir_config *) ap_palloc(p,
944 + sizeof(actions_dir_config));
947 - new->action_types = ap_overlay_tables(p, add->action_types,
948 - base->action_types);
949 + new->actions_types = ap_overlay_tables(p, add->actions_types,
950 + base->actions_types);
952 for (i = 0; i < METHODS; ++i) {
953 new->scripted[i] = add->scripted[i] ? add->scripted[i]
954 @@ -133,14 +133,14 @@
958 -static const char *add_action(cmd_parms *cmd, action_dir_config *m, char *type,
959 +static const char *add_actions(cmd_parms *cmd, actions_dir_config *m, char *type,
962 - ap_table_setn(m->action_types, type, script);
963 + ap_table_setn(m->actions_types, type, script);
967 -static const char *set_script(cmd_parms *cmd, action_dir_config *m,
968 +static const char *set_script(cmd_parms *cmd, actions_dir_config *m,
969 char *method, char *script)
972 @@ -182,20 +182,20 @@
976 -static const command_rec action_cmds[] =
977 +static const command_rec actions_cmds[] =
979 - {"Action", add_action, NULL, OR_FILEINFO, TAKE2,
980 + {"Action", add_actions, NULL, OR_FILEINFO, TAKE2,
981 "a media type followed by a script name"},
982 {"Script", set_script, NULL, ACCESS_CONF | RSRC_CONF, TAKE2,
983 "a method followed by a script name"},
987 -static int action_handler(request_rec *r)
988 +static int actions_handler(request_rec *r)
990 - action_dir_config *conf = (action_dir_config *)
991 - ap_get_module_config(r->per_dir_config, &action_module);
992 - const char *t, *action = r->handler ? r->handler :
993 + actions_dir_config *conf = (actions_dir_config *)
994 + ap_get_module_config(r->per_dir_config, &actions_module);
995 + const char *t, *actions = r->handler ? r->handler :
996 ap_field_noparam(r->pool, r->content_type);
1003 - /* Second, check for actions (which override the method scripts) */
1004 - if ((t = ap_table_get(conf->action_types,
1005 - action ? action : ap_default_type(r)))) {
1006 + /* Second, check for actionss (which override the method scripts) */
1007 + if ((t = ap_table_get(conf->actions_types,
1008 + actions ? actions : ap_default_type(r)))) {
1012 @@ -260,22 +260,22 @@
1016 -static const handler_rec action_handlers[] =
1017 +static const handler_rec actions_handlers[] =
1019 - {"*/*", action_handler},
1020 + {"*/*", actions_handler},
1024 -module action_module =
1025 +module actions_module =
1027 STANDARD_MODULE_STUFF,
1028 NULL, /* initializer */
1029 - create_action_dir_config, /* dir config creater */
1030 - merge_action_dir_configs, /* dir merger --- default is to override */
1031 + create_actions_dir_config, /* dir config creater */
1032 + merge_actions_dir_configs, /* dir merger --- default is to override */
1033 NULL, /* server config */
1034 NULL, /* merge server config */
1035 - action_cmds, /* command table */
1036 - action_handlers, /* handlers */
1037 + actions_cmds, /* command table */
1038 + actions_handlers, /* handlers */
1039 NULL, /* filename translation */
1040 NULL, /* check_user_id */
1041 NULL, /* check auth */
1042 diff -Nru apache_1.3.12/src/modules/standard/mod_auth_anon.c apache_1.3.12.new/src/modules/standard/mod_auth_anon.c
1043 --- apache_1.3.12/src/modules/standard/mod_auth_anon.c Thu Oct 21 22:45:15 1999
1044 +++ apache_1.3.12.new/src/modules/standard/mod_auth_anon.c Mon Apr 3 00:50:56 2000
1045 @@ -114,12 +114,12 @@
1046 int auth_anon_mustemail;
1047 int auth_anon_authoritative;
1049 -} anon_auth_config_rec;
1050 +} auth_anon_config_rec;
1052 -static void *create_anon_auth_dir_config(pool *p, char *d)
1053 +static void *create_auth_anon_dir_config(pool *p, char *d)
1055 - anon_auth_config_rec *sec = (anon_auth_config_rec *)
1056 - ap_pcalloc(p, sizeof(anon_auth_config_rec));
1057 + auth_anon_config_rec *sec = (auth_anon_config_rec *)
1058 + ap_pcalloc(p, sizeof(auth_anon_config_rec));
1061 return NULL; /* no memory... */
1062 @@ -136,39 +136,39 @@
1065 static const char *anon_set_passwd_flag(cmd_parms *cmd,
1066 - anon_auth_config_rec * sec, int arg)
1067 + auth_anon_config_rec * sec, int arg)
1069 sec->auth_anon_mustemail = arg;
1073 static const char *anon_set_userid_flag(cmd_parms *cmd,
1074 - anon_auth_config_rec * sec, int arg)
1075 + auth_anon_config_rec * sec, int arg)
1077 sec->auth_anon_nouserid = arg;
1080 static const char *anon_set_logemail_flag(cmd_parms *cmd,
1081 - anon_auth_config_rec * sec, int arg)
1082 + auth_anon_config_rec * sec, int arg)
1084 sec->auth_anon_logemail = arg;
1087 static const char *anon_set_verifyemail_flag(cmd_parms *cmd,
1088 - anon_auth_config_rec * sec, int arg)
1089 + auth_anon_config_rec * sec, int arg)
1091 sec->auth_anon_verifyemail = arg;
1094 static const char *anon_set_authoritative_flag(cmd_parms *cmd,
1095 - anon_auth_config_rec * sec, int arg)
1096 + auth_anon_config_rec * sec, int arg)
1098 sec->auth_anon_authoritative = arg;
1102 static const char *anon_set_string_slots(cmd_parms *cmd,
1103 - anon_auth_config_rec * sec, char *arg)
1104 + auth_anon_config_rec * sec, char *arg)
1112 -static const command_rec anon_auth_cmds[] =
1113 +static const command_rec auth_anon_cmds[] =
1115 {"Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, ITERATE,
1116 "a space-separated list of user IDs"},
1117 @@ -209,13 +209,13 @@
1121 -module MODULE_VAR_EXPORT anon_auth_module;
1122 +module MODULE_VAR_EXPORT auth_anon_module;
1124 -static int anon_authenticate_basic_user(request_rec *r)
1125 +static int authenticate_anon_basic_user(request_rec *r)
1127 - anon_auth_config_rec *sec =
1128 - (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
1129 - &anon_auth_module);
1130 + auth_anon_config_rec *sec =
1131 + (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config,
1132 + &auth_anon_module);
1133 conn_rec *c = r->connection;
1134 const char *sent_pw;
1139 conn_rec *c = r->connection;
1140 - anon_auth_config_rec *sec =
1141 - (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
1142 - &anon_auth_module);
1143 + auth_anon_config_rec *sec =
1144 + (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config,
1145 + &auth_anon_module);
1147 if (!sec->auth_anon)
1149 @@ -291,18 +291,18 @@
1153 -module MODULE_VAR_EXPORT anon_auth_module =
1154 +module MODULE_VAR_EXPORT auth_anon_module =
1156 STANDARD_MODULE_STUFF,
1157 NULL, /* initializer */
1158 - create_anon_auth_dir_config, /* dir config creater */
1159 + create_auth_anon_dir_config, /* dir config creater */
1160 NULL, /* dir merger ensure strictness */
1161 NULL, /* server config */
1162 NULL, /* merge server config */
1163 - anon_auth_cmds, /* command table */
1164 + auth_anon_cmds, /* command table */
1165 NULL, /* handlers */
1166 NULL, /* filename translation */
1167 - anon_authenticate_basic_user, /* check_user_id */
1168 + authenticate_anon_basic_user, /* check_user_id */
1169 check_anon_access, /* check auth */
1170 NULL, /* check access */
1171 NULL, /* type_checker */