]> git.pld-linux.org Git - packages/apache1.git/blame - apache1-modules_symbols.patch
projects / packages / apache1.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
rel 15; builds
[packages/apache1.git] / apache1-modules_symbols.patch
CommitLineData
500394d0
JR		 1diff -urN apache_1.3.14.orig/src/modules/standard/mod_actions.c apache_1.3.14/src/modules/standard/mod_actions.c
2--- apache_1.3.14.orig/src/modules/standard/mod_actions.c Wed Feb 2 21:44:00 2000
3+++ apache_1.3.14/src/modules/standard/mod_actions.c Sat Nov 11 22:52:25 2000
4@@ -96,34 +96,34 @@
5 * track extension method mappings -- table keys are case-INsensitive.
6 */
7 typedef struct {
8- table *action_types; /* Added with Action... */
9+ table *actions_types; /* Added with Action... */
10 char *scripted[METHODS]; /* Added with Script... */
11 array_header *xmethods; /* Added with Script -- extension methods */
12-} action_dir_config;
13+} actions_dir_config;
7a621ca3 14
500394d0
JR		 15-module action_module;
16+module actions_module;
17
18-static void *create_action_dir_config(pool *p, char *dummy)
19+static void *create_actions_dir_config(pool *p, char *dummy)
7a621ca3 20 {
500394d0
JR		 21- action_dir_config *new =
22- (action_dir_config *) ap_palloc(p, sizeof(action_dir_config));
23+ actions_dir_config *new =
24+ (actions_dir_config *) ap_palloc(p, sizeof(actions_dir_config));
25
26- new->action_types = ap_make_table(p, 4);
27+ new->actions_types = ap_make_table(p, 4);
28 memset(new->scripted, 0, sizeof(new->scripted));
29 new->xmethods = ap_make_array(p, 4, sizeof(xmethod_t));
30 return new;
7a621ca3 31 }
32
500394d0
JR		 33-static void *merge_action_dir_configs(pool *p, void *basev, void *addv)
34+static void *merge_actions_dir_configs(pool *p, void *basev, void *addv)
7a621ca3 35 {
500394d0
JR		 36- action_dir_config *base = (action_dir_config *) basev;
37- action_dir_config *add = (action_dir_config *) addv;
38- action_dir_config *new = (action_dir_config *) ap_palloc(p,
39- sizeof(action_dir_config));
40+ actions_dir_config *base = (actions_dir_config *) basev;
41+ actions_dir_config *add = (actions_dir_config *) addv;
42+ actions_dir_config *new = (actions_dir_config *) ap_palloc(p,
43+ sizeof(actions_dir_config));
44 int i;
7a621ca3 45
500394d0
JR		 46- new->action_types = ap_overlay_tables(p, add->action_types,
47- base->action_types);
48+ new->actions_types = ap_overlay_tables(p, add->actions_types,
49+ base->actions_types);
7a621ca3 50
500394d0
JR		 51 for (i = 0; i < METHODS; ++i) {
52 new->scripted[i] = add->scripted[i] ? add->scripted[i]
53@@ -133,14 +133,14 @@
54 return new;
7a621ca3 55 }
56
500394d0
JR		 57-static const char *add_action(cmd_parms *cmd, action_dir_config *m, char *type,
58+static const char *add_actions(cmd_parms *cmd, actions_dir_config *m, char *type,
59 char *script)
7a621ca3 60 {
500394d0
JR		 61- ap_table_setn(m->action_types, type, script);
62+ ap_table_setn(m->actions_types, type, script);
63 return NULL;
64 }
7a621ca3 65
500394d0
JR		 66-static const char *set_script(cmd_parms *cmd, action_dir_config *m,
67+static const char *set_script(cmd_parms *cmd, actions_dir_config *m,
68 char *method, char *script)
7a621ca3 69 {
500394d0
JR		 70 int methnum;
71@@ -182,20 +182,20 @@
72 return NULL;
7a621ca3 73 }
74
500394d0
JR		 75-static const command_rec action_cmds[] =
76+static const command_rec actions_cmds[] =
7a621ca3 77 {
500394d0
JR		 78- {"Action", add_action, NULL, OR_FILEINFO, TAKE2,
79+ {"Action", add_actions, NULL, OR_FILEINFO, TAKE2,
80 "a media type followed by a script name"},
81 {"Script", set_script, NULL, ACCESS_CONF | RSRC_CONF, TAKE2,
82 "a method followed by a script name"},
83 {NULL}
7a621ca3 84 };
7a621ca3 85
500394d0
JR		 86-static int action_handler(request_rec *r)
87+static int actions_handler(request_rec *r)
7a621ca3 88 {
500394d0
JR		 89- action_dir_config *conf = (action_dir_config *)
90- ap_get_module_config(r->per_dir_config, &action_module);
91- const char *t, *action = r->handler ? r->handler :
92+ actions_dir_config *conf = (actions_dir_config *)
93+ ap_get_module_config(r->per_dir_config, &actions_module);
94+ const char *t, *actions = r->handler ? r->handler :
95 ap_field_noparam(r->pool, r->content_type);
96 const char *script;
97 int i;
98@@ -242,9 +242,9 @@
99 return DECLINED;
7a621ca3 100 }
101
500394d0
JR		 102- /* Second, check for actions (which override the method scripts) */
103- if ((t = ap_table_get(conf->action_types,
104- action ? action : ap_default_type(r)))) {
105+ /* Second, check for actionss (which override the method scripts) */
106+ if ((t = ap_table_get(conf->actions_types,
107+ actions ? actions : ap_default_type(r)))) {
108 script = t;
7a621ca3 109 }
110
500394d0
JR		 111@@ -260,22 +260,22 @@
112 return OK;
7a621ca3 113 }
114
500394d0
JR		 115-static const handler_rec action_handlers[] =
116+static const handler_rec actions_handlers[] =
7a621ca3 117 {
500394d0
JR		 118- {"*/*", action_handler},
119+ {"*/*", actions_handler},
7a621ca3 120 {NULL}
121 };
122
500394d0
JR		 123-module action_module =
124+module actions_module =
7a621ca3 125 {
126 STANDARD_MODULE_STUFF,
500394d0
JR		 127 NULL, /* initializer */
128- create_action_dir_config, /* dir config creater */
129- merge_action_dir_configs, /* dir merger --- default is to override */
130+ create_actions_dir_config, /* dir config creater */
131+ merge_actions_dir_configs, /* dir merger --- default is to override */
132 NULL, /* server config */
133 NULL, /* merge server config */
134- action_cmds, /* command table */
135- action_handlers, /* handlers */
136+ actions_cmds, /* command table */
137+ actions_handlers, /* handlers */
138 NULL, /* filename translation */
139 NULL, /* check_user_id */
140 NULL, /* check auth */
141diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_anon.c apache_1.3.14/src/modules/standard/mod_auth_anon.c
142--- apache_1.3.14.orig/src/modules/standard/mod_auth_anon.c Fri Jun 2 01:42:27 2000
143+++ apache_1.3.14/src/modules/standard/mod_auth_anon.c Sat Nov 11 22:52:25 2000
144@@ -114,12 +114,12 @@
145 int auth_anon_mustemail;
146 int auth_anon_authoritative;
7a621ca3 147
500394d0
JR		 148-} anon_auth_config_rec;
149+} auth_anon_config_rec;
7a621ca3 150
500394d0
JR		 151-static void *create_anon_auth_dir_config(pool *p, char *d)
152+static void *create_auth_anon_dir_config(pool *p, char *d)
7a621ca3 153 {
500394d0
JR		 154- anon_auth_config_rec *sec = (anon_auth_config_rec *)
155- ap_pcalloc(p, sizeof(anon_auth_config_rec));
156+ auth_anon_config_rec *sec = (auth_anon_config_rec *)
157+ ap_pcalloc(p, sizeof(auth_anon_config_rec));
7a621ca3 158
500394d0
JR		 159 if (!sec)
160 return NULL; /* no memory... */
161@@ -136,39 +136,39 @@
7a621ca3 162 }
163
500394d0
JR		 164 static const char *anon_set_passwd_flag(cmd_parms *cmd,
165- anon_auth_config_rec * sec, int arg)
166+ auth_anon_config_rec * sec, int arg)
7a621ca3 167 {
500394d0
JR		 168 sec->auth_anon_mustemail = arg;
169 return NULL;
170 }
7a621ca3 171
500394d0
JR		 172 static const char *anon_set_userid_flag(cmd_parms *cmd,
173- anon_auth_config_rec * sec, int arg)
174+ auth_anon_config_rec * sec, int arg)
175 {
176 sec->auth_anon_nouserid = arg;
177 return NULL;
178 }
179 static const char *anon_set_logemail_flag(cmd_parms *cmd,
180- anon_auth_config_rec * sec, int arg)
181+ auth_anon_config_rec * sec, int arg)
182 {
183 sec->auth_anon_logemail = arg;
184 return NULL;
185 }
186 static const char *anon_set_verifyemail_flag(cmd_parms *cmd,
187- anon_auth_config_rec * sec, int arg)
188+ auth_anon_config_rec * sec, int arg)
189 {
190 sec->auth_anon_verifyemail = arg;
191 return NULL;
192 }
193 static const char *anon_set_authoritative_flag(cmd_parms *cmd,
194- anon_auth_config_rec * sec, int arg)
195+ auth_anon_config_rec * sec, int arg)
196 {
197 sec->auth_anon_authoritative = arg;
198 return NULL;
199 }
7a621ca3 200
500394d0
JR		 201 static const char *anon_set_string_slots(cmd_parms *cmd,
202- anon_auth_config_rec * sec, char *arg)
203+ auth_anon_config_rec * sec, char *arg)
7a621ca3 204 {
500394d0
JR		 205
206 auth_anon *first;
207@@ -191,7 +191,7 @@
208 return NULL;
7a621ca3 209 }
210
500394d0
JR		 211-static const command_rec anon_auth_cmds[] =
212+static const command_rec auth_anon_cmds[] =
7a621ca3 213 {
500394d0
JR		 214 {"Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, ITERATE,
215 "a space-separated list of user IDs"},
216@@ -209,13 +209,13 @@
217 {NULL}
218 };
219
220-module MODULE_VAR_EXPORT anon_auth_module;
221+module MODULE_VAR_EXPORT auth_anon_module;
222
223-static int anon_authenticate_basic_user(request_rec *r)
224+static int authenticate_anon_basic_user(request_rec *r)
225 {
226- anon_auth_config_rec *sec =
227- (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
228- &anon_auth_module);
229+ auth_anon_config_rec *sec =
230+ (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config,
231+ &auth_anon_module);
7a621ca3 232 conn_rec *c = r->connection;
233 const char *sent_pw;
500394d0
JR		 234 int res = DECLINED;
235@@ -275,9 +275,9 @@
7a621ca3 236 {
500394d0
JR		 237 #ifdef NOTYET
238 conn_rec *c = r->connection;
239- anon_auth_config_rec *sec =
240- (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
241- &anon_auth_module);
242+ auth_anon_config_rec *sec =
243+ (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config,
244+ &auth_anon_module);
7a621ca3 245
500394d0
JR		 246 if (!sec->auth_anon)
247 return DECLINED;
248@@ -291,18 +291,18 @@
7a621ca3 249 }
250
251
500394d0
JR		 252-module MODULE_VAR_EXPORT anon_auth_module =
253+module MODULE_VAR_EXPORT auth_anon_module =
7a621ca3 254 {
255 STANDARD_MODULE_STUFF,
256 NULL, /* initializer */
500394d0
JR		 257- create_anon_auth_dir_config, /* dir config creater */
258+ create_auth_anon_dir_config, /* dir config creater */
259 NULL, /* dir merger ensure strictness */
7a621ca3 260 NULL, /* server config */
261 NULL, /* merge server config */
500394d0
JR		 262- anon_auth_cmds, /* command table */
263+ auth_anon_cmds, /* command table */
7a621ca3 264 NULL, /* handlers */
265 NULL, /* filename translation */
500394d0
JR		 266- anon_authenticate_basic_user, /* check_user_id */
267+ authenticate_anon_basic_user, /* check_user_id */
268 check_anon_access, /* check auth */
7a621ca3 269 NULL, /* check access */
270 NULL, /* type_checker */
500394d0
JR		 271diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_db.c apache_1.3.14/src/modules/standard/mod_auth_db.c
272--- apache_1.3.14.orig/src/modules/standard/mod_auth_db.c Sun Nov 28 13:59:51 1999
273+++ apache_1.3.14/src/modules/standard/mod_auth_db.c Sat Nov 11 22:52:25 2000
274@@ -72,7 +72,7 @@
275 * instead of AuthDBMUserFile AuthDBMGroupFile
276 *
277 * Also, in the configuration file you need to specify
278- * db_auth_module rather than dbm_auth_module
279+ * auth_db_module rather than auth_dbm_module
280 *
281 * On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically
282 * mapped to Berkeley DB. You can use either mod_auth_dbm or
283@@ -111,12 +111,12 @@
284 char *auth_dbpwfile;
285 char *auth_dbgrpfile;
286 int auth_dbauthoritative;
287-} db_auth_config_rec;
288+} auth_db_config_rec;
7a621ca3 289
500394d0
JR		 290-static void *create_db_auth_dir_config(pool *p, char *d)
291+static void *create_auth_db_dir_config(pool *p, char *d)
7a621ca3 292 {
500394d0
JR		 293- db_auth_config_rec *sec
294- = (db_auth_config_rec *) ap_pcalloc(p, sizeof(db_auth_config_rec));
295+ auth_db_config_rec *sec
296+ = (auth_db_config_rec *) ap_pcalloc(p, sizeof(auth_db_config_rec));
297 sec->auth_dbpwfile = NULL;
298 sec->auth_dbgrpfile = NULL;
299 sec->auth_dbauthoritative = 1; /* fortress is secure by default */
300@@ -131,28 +131,28 @@
301 return ap_set_file_slot(cmd, offset, f);
302 }
7a621ca3 303
500394d0
JR		 304-static const command_rec db_auth_cmds[] =
305+static const command_rec auth_db_cmds[] =
306 {
307 {"AuthDBUserFile", ap_set_file_slot,
308- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
309+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile),
310 OR_AUTHCFG, TAKE1, NULL},
311 {"AuthDBGroupFile", ap_set_file_slot,
312- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
313+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile),
314 OR_AUTHCFG, TAKE1, NULL},
315 {"AuthUserFile", set_db_slot,
316- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
317+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile),
318 OR_AUTHCFG, TAKE12, NULL},
319 {"AuthGroupFile", set_db_slot,
320- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
321+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile),
322 OR_AUTHCFG, TAKE12, NULL},
323 {"AuthDBAuthoritative", ap_set_flag_slot,
324- (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
325+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbauthoritative),
326 OR_AUTHCFG, FLAG,
327 "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"},
328 {NULL}
329 };
330
331-module db_auth_module;
332+module auth_db_module;
333
334 static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
335 {
336@@ -226,11 +226,11 @@
337 return grp_data;
338 }
339
340-static int db_authenticate_basic_user(request_rec *r)
341+static int authenticate_db_basic_user(request_rec *r)
342 {
343- db_auth_config_rec *sec =
344- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
345- &db_auth_module);
346+ auth_db_config_rec *sec =
347+ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
348+ &auth_db_module);
349 conn_rec *c = r->connection;
350 const char *sent_pw;
351 char *real_pw, *colon_pw;
352@@ -271,9 +271,9 @@
353
354 static int db_check_auth(request_rec *r)
355 {
356- db_auth_config_rec *sec =
357- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
358- &db_auth_module);
359+ auth_db_config_rec *sec =
360+ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
361+ &auth_db_module);
362 char *user = r->connection->user;
363 int m = r->method_number;
364
365@@ -331,18 +331,18 @@
366 }
367
368
369-module db_auth_module =
370+module auth_db_module =
371 {
372 STANDARD_MODULE_STUFF,
373 NULL, /* initializer */
374- create_db_auth_dir_config, /* dir config creater */
375+ create_auth_db_dir_config, /* dir config creater */
376 NULL, /* dir merger --- default is to override */
377 NULL, /* server config */
378 NULL, /* merge server config */
379- db_auth_cmds, /* command table */
380+ auth_db_cmds, /* command table */
381 NULL, /* handlers */
382 NULL, /* filename translation */
383- db_authenticate_basic_user, /* check_user_id */
384+ authenticate_db_basic_user, /* check_user_id */
385 db_check_auth, /* check auth */
386 NULL, /* check access */
387 NULL, /* type_checker */
388diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c apache_1.3.14/src/modules/standard/mod_auth_dbm.c
389--- apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c Thu Sep 21 15:19:33 2000
390+++ apache_1.3.14/src/modules/standard/mod_auth_dbm.c Sat Nov 11 22:56:37 2000
391@@ -92,7 +92,7 @@
392 * instead.
393 *
394 * MODULE-DEFINITION-START
395- * Name: dbm_auth_module
396+ * Name: auth_dbm_module
397 * ConfigStart
398 . ./helpers/find-dbm-lib
399 * ConfigEnd
400@@ -105,12 +105,12 @@
401 char *auth_dbmgrpfile;
402 int auth_dbmauthoritative;
403
404-} dbm_auth_config_rec;
405+} auth_dbm_config_rec;
406
407-static void *create_dbm_auth_dir_config(pool *p, char *d)
408+static void *create_auth_dbm_dir_config(pool *p, char *d)
409 {
410- dbm_auth_config_rec *sec
411- = (dbm_auth_config_rec *) ap_pcalloc(p, sizeof(dbm_auth_config_rec));
412+ auth_dbm_config_rec *sec
413+ = (auth_dbm_config_rec *) ap_pcalloc(p, sizeof(auth_dbm_config_rec));
414
415 sec->auth_dbmpwfile = NULL;
416 sec->auth_dbmgrpfile = NULL;
417@@ -127,27 +127,27 @@
418 return ap_set_file_slot(cmd, offset, f);
419 }
420
421-static const command_rec dbm_auth_cmds[] =
422+static const command_rec auth_dbm_cmds[] =
423 {
424 {"AuthDBMUserFile", ap_set_file_slot,
425- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
426+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile),
427 OR_AUTHCFG, TAKE1, NULL},
428 {"AuthDBMGroupFile", ap_set_file_slot,
429- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
430+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile),
431 OR_AUTHCFG, TAKE1, NULL},
432 {"AuthUserFile", set_dbm_slot,
433- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
434+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile),
435 OR_AUTHCFG, TAKE12, NULL},
436 {"AuthGroupFile", set_dbm_slot,
437- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
438+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile),
439 OR_AUTHCFG, TAKE12, NULL},
440 {"AuthDBMAuthoritative", ap_set_flag_slot,
441- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
442+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmauthoritative),
443 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"},
444 {NULL}
445 };
446
447-module MODULE_VAR_EXPORT dbm_auth_module;
448+module MODULE_VAR_EXPORT auth_dbm_module;
449
450 static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
451 {
452@@ -210,11 +210,11 @@
453 return grp_data;
454 }
455
456-static int dbm_authenticate_basic_user(request_rec *r)
457+static int authenticate_dbm_basic_user(request_rec *r)
458 {
459- dbm_auth_config_rec *sec =
460- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
461- &dbm_auth_module);
462+ auth_dbm_config_rec *sec =
463+ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
464+ &auth_dbm_module);
465 conn_rec *c = r->connection;
466 const char *sent_pw;
467 char *real_pw, *colon_pw;
468@@ -255,9 +255,9 @@
469
470 static int dbm_check_auth(request_rec *r)
471 {
472- dbm_auth_config_rec *sec =
473- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
474- &dbm_auth_module);
475+ auth_dbm_config_rec *sec =
476+ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
477+ &auth_dbm_module);
478 char *user = r->connection->user;
479 int m = r->method_number;
480
481@@ -316,18 +316,18 @@
482 }
483
484
485-module MODULE_VAR_EXPORT dbm_auth_module =
486+module MODULE_VAR_EXPORT auth_dbm_module =
487 {
488 STANDARD_MODULE_STUFF,
489 NULL, /* initializer */
490- create_dbm_auth_dir_config, /* dir config creater */
491+ create_auth_dbm_dir_config, /* dir config creater */
492 NULL, /* dir merger --- default is to override */
493 NULL, /* server config */
494 NULL, /* merge server config */
495- dbm_auth_cmds, /* command table */
496+ auth_dbm_cmds, /* command table */
497 NULL, /* handlers */
498 NULL, /* filename translation */
499- dbm_authenticate_basic_user, /* check_user_id */
500+ authenticate_dbm_basic_user, /* check_user_id */
501 dbm_check_auth, /* check auth */
502 NULL, /* check access */
503 NULL, /* type_checker */
504diff -urN apache_1.3.14.orig/src/modules/standard/mod_include.c apache_1.3.14/src/modules/standard/mod_include.c
505--- apache_1.3.14.orig/src/modules/standard/mod_include.c Fri Sep 22 20:26:32 2000
506+++ apache_1.3.14/src/modules/standard/mod_include.c Sat Nov 11 22:52:25 2000
507@@ -106,7 +106,7 @@
508 #define RAW_ASCII_CHAR(ch) (ch)
509 #endif /*CHARSET_EBCDIC*/
510
511-module MODULE_VAR_EXPORT includes_module;
512+module MODULE_VAR_EXPORT include_module;
513
514 /* ------------------------ Environment function -------------------------- */
515
516@@ -733,7 +733,7 @@
517
518 /* see the Kludge in send_parsed_file for why */
519 if (rr)
520- ap_set_module_config(rr->request_config, &includes_module, r);
521+ ap_set_module_config(rr->request_config, &include_module, r);
522
523 if (!error_fmt && ap_run_sub_req(rr)) {
524 error_fmt = "unable to include \"%s\" in parsed file %s";
525@@ -2311,7 +2311,7 @@
526 * option only changes the default.
527 */
528
529-module includes_module;
530+module include_module;
531 enum xbithack {
532 xbithack_off, xbithack_on, xbithack_full
533 };
534@@ -2322,7 +2322,7 @@
535 #define DEFAULT_XBITHACK xbithack_off
536 #endif
537
538-static void *create_includes_dir_config(pool *p, char *dummy)
539+static void *create_include_dir_config(pool *p, char *dummy)
540 {
541 enum xbithack *result = (enum xbithack *) ap_palloc(p, sizeof(enum xbithack));
542 *result = DEFAULT_XBITHACK;
543@@ -2353,7 +2353,7 @@
544 {
545 FILE *f;
546 enum xbithack *state =
547- (enum xbithack *) ap_get_module_config(r->per_dir_config, &includes_module);
548+ (enum xbithack *) ap_get_module_config(r->per_dir_config, &include_module);
549 int errstatus;
550 request_rec *parent;
551
552@@ -2424,7 +2424,7 @@
553 while (q) {
554 if (ap_table_get(q->notes, PARENT_STRING)) {
555 /* Kludge --- See below */
556- ap_set_module_config(r->request_config, &includes_module, q);
557+ ap_set_module_config(r->request_config, &include_module, q);
558
559 /* Create the initial environment in the parent */
560 ap_add_common_vars(q);
561@@ -2446,7 +2446,7 @@
562 }
563 }
564
565- if ((parent = ap_get_module_config(r->request_config, &includes_module))) {
566+ if ((parent = ap_get_module_config(r->request_config, &include_module))) {
567 /* Kludge --- for nested includes, we want to keep the subprocess
568 * environment of the base document (for compatibility); that means
569 * torquing our own last_modified date as well so that the
570@@ -2516,7 +2516,7 @@
571 }
572
573 state = (enum xbithack *) ap_get_module_config(r->per_dir_config,
574- &includes_module);
575+ &include_module);
576
577 if (*state == xbithack_off) {
578 return DECLINED;
579@@ -2525,13 +2525,13 @@
580 #endif
581 }
582
583-static const command_rec includes_cmds[] =
584+static const command_rec include_cmds[] =
585 {
586 {"XBitHack", set_xbithack, NULL, OR_OPTIONS, TAKE1, "Off, On, or Full"},
587 {NULL}
588 };
589
590-static const handler_rec includes_handlers[] =
591+static const handler_rec include_handlers[] =
592 {
593 {INCLUDES_MAGIC_TYPE, send_shtml_file},
594 {INCLUDES_MAGIC_TYPE3, send_shtml_file},
595@@ -2540,16 +2540,16 @@
596 {NULL}
597 };
598
599-module MODULE_VAR_EXPORT includes_module =
600+module MODULE_VAR_EXPORT include_module =
601 {
602 STANDARD_MODULE_STUFF,
603 NULL, /* initializer */
604- create_includes_dir_config, /* dir config creater */
605+ create_include_dir_config, /* dir config creater */
606 NULL, /* dir merger --- default is to override */
607 NULL, /* server config */
608 NULL, /* merge server config */
609- includes_cmds, /* command table */
610- includes_handlers, /* handlers */
611+ include_cmds, /* command table */
612+ include_handlers, /* handlers */
613 NULL, /* filename translation */
614 NULL, /* check_user_id */
615 NULL, /* check auth */
616diff -urN apache_1.3.14.orig/src/modules/standard/mod_log_agent.c apache_1.3.14/src/modules/standard/mod_log_agent.c
617--- apache_1.3.14.orig/src/modules/standard/mod_log_agent.c Fri Jan 1 20:05:10 1999
618+++ apache_1.3.14/src/modules/standard/mod_log_agent.c Sat Nov 11 22:52:25 2000
619@@ -60,7 +60,7 @@
620 #include "http_config.h"
621 #include "http_log.h"
622
623-module agent_log_module;
624+module log_agent_module;
625
626 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
627 #ifdef OS2
628@@ -73,12 +73,12 @@
629 typedef struct {
630 char *fname;
631 int agent_fd;
632-} agent_log_state;
633+} log_agent_state;
634
635-static void *make_agent_log_state(pool *p, server_rec *s)
636+static void *make_log_agent_state(pool *p, server_rec *s)
637 {
638- agent_log_state *cls =
639- (agent_log_state *) ap_palloc(p, sizeof(agent_log_state));
640+ log_agent_state *cls =
641+ (log_agent_state *) ap_palloc(p, sizeof(log_agent_state));
642
643 cls->fname = "";
7a621ca3 644 cls->agent_fd = -1;
645@@ -86,26 +86,26 @@
646 return (void *) cls;
647 }
648
649-static const char *set_agent_log(cmd_parms *parms, void *dummy, char *arg)
650+static const char *set_log_agent(cmd_parms *parms, void *dummy, char *arg)
651 {
652- agent_log_state *cls = ap_get_module_config(parms->server->module_config,
653- &agent_log_module);
654+ log_agent_state *cls = ap_get_module_config(parms->server->module_config,
655+ &log_agent_module);
656
657 cls->fname = arg;
658 return NULL;
659 }
660
661-static const command_rec agent_log_cmds[] =
662+static const command_rec log_agent_cmds[] =
663 {
664- {"AgentLog", set_agent_log, NULL, RSRC_CONF, TAKE1,
665+ {"AgentLog", set_log_agent, NULL, RSRC_CONF, TAKE1,
666 "the filename of the agent log"},
667 {NULL}
668 };
669
670-static void open_agent_log(server_rec *s, pool *p)
671+static void open_log_agent(server_rec *s, pool *p)
672 {
673- agent_log_state *cls = ap_get_module_config(s->module_config,
674- &agent_log_module);
675+ log_agent_state *cls = ap_get_module_config(s->module_config,
676+ &log_agent_module);
677
678 char *fname = ap_server_root_relative(p, cls->fname);
679
680@@ -132,16 +132,16 @@
681 }
682 }
683
684-static void init_agent_log(server_rec *s, pool *p)
685+static void init_log_agent(server_rec *s, pool *p)
686 {
687 for (; s; s = s->next)
688- open_agent_log(s, p);
689+ open_log_agent(s, p);
690 }
691
692-static int agent_log_transaction(request_rec *orig)
693+static int log_agent_transaction(request_rec *orig)
694 {
695- agent_log_state *cls = ap_get_module_config(orig->server->module_config,
696- &agent_log_module);
697+ log_agent_state *cls = ap_get_module_config(orig->server->module_config,
698+ &log_agent_module);
699
700 char str[HUGE_STRING_LEN];
701 const char *agent;
702@@ -164,15 +164,15 @@
703 return OK;
704 }
705
706-module agent_log_module =
707+module log_agent_module =
708 {
709 STANDARD_MODULE_STUFF,
710- init_agent_log, /* initializer */
711+ init_log_agent, /* initializer */
712 NULL, /* create per-dir config */
713 NULL, /* merge per-dir config */
714- make_agent_log_state, /* server config */
715+ make_log_agent_state, /* server config */
716 NULL, /* merge server config */
717- agent_log_cmds, /* command table */
718+ log_agent_cmds, /* command table */
719 NULL, /* handlers */
720 NULL, /* filename translation */
721 NULL, /* check_user_id */
722@@ -180,7 +180,7 @@
723 NULL, /* check access */
724 NULL, /* type_checker */
725 NULL, /* fixups */
726- agent_log_transaction, /* logger */
727+ log_agent_transaction, /* logger */
728 NULL, /* header parser */
729 NULL, /* child_init */
730 NULL, /* child_exit */
500394d0
JR		 731diff -urN apache_1.3.14.orig/src/modules/standard/mod_log_config.c apache_1.3.14/src/modules/standard/mod_log_config.c
732--- apache_1.3.14.orig/src/modules/standard/mod_log_config.c Sat Nov 11 22:51:24 2000
733+++ apache_1.3.14/src/modules/standard/mod_log_config.c Sat Nov 11 22:52:25 2000
7a621ca3 734@@ -180,7 +180,7 @@
735 #include "http_log.h"
736 #include <limits.h>
737
738-module MODULE_VAR_EXPORT config_log_module;
739+module MODULE_VAR_EXPORT log_config_module;
740
741 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
500394d0 742 #if defined(OS2) || defined(WIN32) || defined(NETWARE)
7a621ca3 743@@ -207,29 +207,29 @@
744
745 /*
746 * multi_log_state is our per-(virtual)-server configuration. We store
747- * an array of the logs we are going to use, each of type config_log_state.
748+ * an array of the logs we are going to use, each of type log_config_state.
749 * If a default log format is given by LogFormat, store in default_format
750 * (backward compat. with mod_log_config). We also store for each virtual
751 * server a pointer to the logs specified for the main server, so that if this
752 * vhost has no logs defined, we can use the main server's logs instead.
753 *
754- * So, for the main server, config_logs contains a list of the log files
755- * and server_config_logs in empty. For a vhost, server_config_logs
756- * points to the same array as config_logs in the main server, and
757- * config_logs points to the array of logs defined inside this vhost,
758+ * So, for the main server, log_configs contains a list of the log files
759+ * and server_log_configs in empty. For a vhost, server_log_configs
760+ * points to the same array as log_configs in the main server, and
761+ * log_configs points to the array of logs defined inside this vhost,
762 * which might be empty.
763 */
764
765 typedef struct {
766 char *default_format_string;
767 array_header *default_format;
768- array_header *config_logs;
769- array_header *server_config_logs;
770+ array_header *log_configs;
771+ array_header *server_log_configs;
772 table *formats;
773 } multi_log_state;
774
775 /*
776- * config_log_state holds the status of a single log file. fname might
777+ * log_config_state holds the status of a single log file. fname might
778 * be NULL, which means this module does no logging for this
779 * request. format might be NULL, in which case the default_format
780 * from the multi_log_state should be used, or if that is NULL as
781@@ -247,7 +247,7 @@
782 int outcnt;
783 char outbuf[LOG_BUFSIZE];
784 #endif
785-} config_log_state;
786+} log_config_state;
787
788 /*
789 * Format items...
790@@ -803,7 +803,7 @@
791 }
792
793 #ifdef BUFFERED_LOGS
794-static void flush_log(config_log_state *cls)
795+static void flush_log(log_config_state *cls)
796 {
797 if (cls->outcnt && cls->log_fd != -1) {
798 write(cls->log_fd, cls->outbuf, cls->outcnt);
799@@ -812,7 +812,7 @@
800 }
801 #endif
802
803-static int config_log_transaction(request_rec *r, config_log_state *cls,
804+static int log_config_transaction(request_rec *r, log_config_state *cls,
805 array_header *default_format)
806 {
807 log_format_item *items;
808@@ -905,27 +905,27 @@
809 static int multi_log_transaction(request_rec *r)
810 {
811 multi_log_state *mls = ap_get_module_config(r->server->module_config,
812- &config_log_module);
813- config_log_state *clsarray;
814+ &log_config_module);
815+ log_config_state *clsarray;
816 int i;
817
818 /*
819 * Log this transaction..
820 */
821- if (mls->config_logs->nelts) {
822- clsarray = (config_log_state *) mls->config_logs->elts;
823- for (i = 0; i < mls->config_logs->nelts; ++i) {
824- config_log_state *cls = &clsarray[i];
825+ if (mls->log_configs->nelts) {
826+ clsarray = (log_config_state *) mls->log_configs->elts;
827+ for (i = 0; i < mls->log_configs->nelts; ++i) {
828+ log_config_state *cls = &clsarray[i];
829
830- config_log_transaction(r, cls, mls->default_format);
831+ log_config_transaction(r, cls, mls->default_format);
832 }
833 }
834- else if (mls->server_config_logs) {
835- clsarray = (config_log_state *) mls->server_config_logs->elts;
836- for (i = 0; i < mls->server_config_logs->nelts; ++i) {
837- config_log_state *cls = &clsarray[i];
838+ else if (mls->server_log_configs) {
839+ clsarray = (log_config_state *) mls->server_log_configs->elts;
840+ for (i = 0; i < mls->server_log_configs->nelts; ++i) {
841+ log_config_state *cls = &clsarray[i];
842
843- config_log_transaction(r, cls, mls->default_format);
844+ log_config_transaction(r, cls, mls->default_format);
845 }
846 }
847
848@@ -937,15 +937,15 @@
849 * Module glue...
850 */
851
852-static void *make_config_log_state(pool *p, server_rec *s)
853+static void *make_log_config_state(pool *p, server_rec *s)
854 {
855 multi_log_state *mls;
856
857 mls = (multi_log_state *) ap_palloc(p, sizeof(multi_log_state));
858- mls->config_logs = ap_make_array(p, 1, sizeof(config_log_state));
859+ mls->log_configs = ap_make_array(p, 1, sizeof(log_config_state));
860 mls->default_format_string = NULL;
861 mls->default_format = NULL;
500394d0
JR		 862- mls->server_config_logs = NULL;
863+ mls->server_log_configs = NULL;
864 mls->formats = ap_make_table(p, 4);
865 ap_table_setn(mls->formats, "CLF", DEFAULT_LOG_FORMAT);
7a621ca3 866
500394d0
JR		 867@@ -958,12 +958,12 @@
868 * vhosts inherit any globally-defined format names.
869 */
7a621ca3 870
500394d0
JR		 871-static void *merge_config_log_state(pool *p, void *basev, void *addv)
872+static void *merge_log_config_state(pool *p, void *basev, void *addv)
873 {
874 multi_log_state *base = (multi_log_state *) basev;
875 multi_log_state *add = (multi_log_state *) addv;
7a621ca3 876
500394d0
JR		 877- add->server_config_logs = base->config_logs;
878+ add->server_log_configs = base->log_configs;
879 if (!add->default_format) {
880 add->default_format_string = base->default_format_string;
881 add->default_format = base->default_format;
882@@ -981,7 +981,7 @@
7a621ca3 883 {
500394d0
JR		 884 const char *err_string = NULL;
885 multi_log_state *mls = ap_get_module_config(cmd->server->module_config,
886- &config_log_module);
887+ &log_config_module);
7a621ca3 888
500394d0
JR		 889 /*
890 * If we were given two arguments, the second is a name to be given to the
891@@ -1007,10 +1007,10 @@
7a621ca3 892 {
500394d0
JR		 893 const char *err_string = NULL;
894 multi_log_state *mls = ap_get_module_config(cmd->server->module_config,
895- &config_log_module);
896- config_log_state *cls;
897+ &log_config_module);
898+ log_config_state *cls;
7a621ca3 899
500394d0
JR		 900- cls = (config_log_state *) ap_push_array(mls->config_logs);
901+ cls = (log_config_state *) ap_push_array(mls->log_configs);
902 cls->condition_var = NULL;
903 if (envclause != NULL) {
904 if (strncasecmp(envclause, "env=", 4) != 0) {
905@@ -1046,7 +1046,7 @@
906 return add_custom_log(cmd, dummy, fn, "%{Cookie}n \"%r\" %t", NULL);
7a621ca3 907 }
908
500394d0
JR		 909-static const command_rec config_log_cmds[] =
910+static const command_rec log_config_cmds[] =
7a621ca3 911 {
500394d0
JR		 912 {"CustomLog", add_custom_log, NULL, RSRC_CONF, TAKE23,
913 "a file name, a custom log format string or format name, "
914@@ -1060,8 +1060,8 @@
915 {NULL}
916 };
7a621ca3 917
500394d0
JR		 918-static config_log_state *open_config_log(server_rec *s, pool *p,
919- config_log_state *cls,
920+static log_config_state *open_log_config(server_rec *s, pool *p,
921+ log_config_state *cls,
922 array_header *default_format)
7a621ca3 923 {
500394d0
JR		 924 if (cls->log_fd > 0) {
925@@ -1096,12 +1096,12 @@
926 return cls;
7a621ca3 927 }
928
500394d0
JR		 929-static config_log_state *open_multi_logs(server_rec *s, pool *p)
930+static log_config_state *open_multi_logs(server_rec *s, pool *p)
7a621ca3 931 {
7a621ca3 932 int i;
500394d0
JR		 933 multi_log_state *mls = ap_get_module_config(s->module_config,
934- &config_log_module);
935- config_log_state *clsarray;
936+ &log_config_module);
937+ log_config_state *clsarray;
938 const char *dummy;
939 const char *format;
7a621ca3 940
500394d0
JR		 941@@ -1116,10 +1116,10 @@
942 mls->default_format = parse_log_string(p, DEFAULT_LOG_FORMAT, &dummy);
943 }
7a621ca3 944
500394d0
JR		 945- if (mls->config_logs->nelts) {
946- clsarray = (config_log_state *) mls->config_logs->elts;
947- for (i = 0; i < mls->config_logs->nelts; ++i) {
948- config_log_state *cls = &clsarray[i];
949+ if (mls->log_configs->nelts) {
950+ clsarray = (log_config_state *) mls->log_configs->elts;
951+ for (i = 0; i < mls->log_configs->nelts; ++i) {
952+ log_config_state *cls = &clsarray[i];
7a621ca3 953
500394d0
JR		 954 if (cls->format_string) {
955 format = ap_table_get(mls->formats, cls->format_string);
956@@ -1128,13 +1128,13 @@
957 }
958 }
959
960- cls = open_config_log(s, p, cls, mls->default_format);
961+ cls = open_log_config(s, p, cls, mls->default_format);
962 }
963 }
964- else if (mls->server_config_logs) {
965- clsarray = (config_log_state *) mls->server_config_logs->elts;
966- for (i = 0; i < mls->server_config_logs->nelts; ++i) {
967- config_log_state *cls = &clsarray[i];
968+ else if (mls->server_log_configs) {
969+ clsarray = (log_config_state *) mls->server_log_configs->elts;
970+ for (i = 0; i < mls->server_log_configs->nelts; ++i) {
971+ log_config_state *cls = &clsarray[i];
972
973 if (cls->format_string) {
974 format = ap_table_get(mls->formats, cls->format_string);
975@@ -1143,14 +1143,14 @@
976 }
977 }
978
979- cls = open_config_log(s, p, cls, mls->default_format);
980+ cls = open_log_config(s, p, cls, mls->default_format);
981 }
982 }
7a621ca3 983
7a621ca3 984 return NULL;
985 }
986
500394d0
JR		 987-static void init_config_log(server_rec *s, pool *p)
988+static void init_log_config(server_rec *s, pool *p)
7a621ca3 989 {
500394d0
JR		 990 /* First, do "physical" server, which gets default log fd and format
991 * for the virtual servers, if they don't override...
992@@ -1170,20 +1170,20 @@
7a621ca3 993 {
500394d0
JR		 994 multi_log_state *mls;
995 array_header *log_list;
996- config_log_state *clsarray;
997+ log_config_state *clsarray;
7a621ca3 998 int i;
7a621ca3 999
500394d0
JR		 1000 for (; s; s = s->next) {
1001- mls = ap_get_module_config(s->module_config, &config_log_module);
1002+ mls = ap_get_module_config(s->module_config, &log_config_module);
1003 log_list = NULL;
1004- if (mls->config_logs->nelts) {
1005- log_list = mls->config_logs;
1006+ if (mls->log_configs->nelts) {
1007+ log_list = mls->log_configs;
1008 }
1009- else if (mls->server_config_logs) {
1010- log_list = mls->server_config_logs;
1011+ else if (mls->server_log_configs) {
1012+ log_list = mls->server_log_configs;
1013 }
1014 if (log_list) {
1015- clsarray = (config_log_state *) log_list->elts;
1016+ clsarray = (log_config_state *) log_list->elts;
1017 for (i = 0; i < log_list->nelts; ++i) {
1018 flush_log(&clsarray[i]);
1019 }
1020@@ -1192,15 +1192,15 @@
7a621ca3 1021 }
500394d0 1022 #endif
7a621ca3 1023
500394d0
JR		 1024-module MODULE_VAR_EXPORT config_log_module =
1025+module MODULE_VAR_EXPORT log_config_module =
7a621ca3 1026 {
1027 STANDARD_MODULE_STUFF,
500394d0
JR		 1028- init_config_log, /* initializer */
1029+ init_log_config, /* initializer */
1030 NULL, /* create per-dir config */
1031 NULL, /* merge per-dir config */
1032- make_config_log_state, /* server config */
1033- merge_config_log_state, /* merge server config */
1034- config_log_cmds, /* command table */
1035+ make_log_config_state, /* server config */
1036+ merge_log_config_state, /* merge server config */
1037+ log_config_cmds, /* command table */
1038 NULL, /* handlers */
1039 NULL, /* filename translation */
1040 NULL, /* check_user_id */
1041diff -urN apache_1.3.14.orig/src/modules/standard/mod_log_referer.c apache_1.3.14/src/modules/standard/mod_log_referer.c
1042--- apache_1.3.14.orig/src/modules/standard/mod_log_referer.c Fri Jan 1 20:05:11 1999
1043+++ apache_1.3.14/src/modules/standard/mod_log_referer.c Sat Nov 11 22:52:25 2000
1044@@ -60,7 +60,7 @@
1045 #include "http_config.h"
1046 #include "http_log.h"
7a621ca3 1047
500394d0
JR		 1048-module referer_log_module;
1049+module log_referer_module;
7a621ca3 1050
500394d0 1051 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
7a621ca3 1052
500394d0
JR		 1053@@ -75,12 +75,12 @@
1054 char *fname;
1055 int referer_fd;
1056 array_header *referer_ignore_list;
1057-} referer_log_state;
1058+} log_referer_state;
7a621ca3 1059
500394d0
JR		 1060-static void *make_referer_log_state(pool *p, server_rec *s)
1061+static void *make_log_referer_state(pool *p, server_rec *s)
7a621ca3 1062 {
500394d0
JR		 1063- referer_log_state *cls =
1064- (referer_log_state *) ap_palloc(p, sizeof(referer_log_state));
1065+ log_referer_state *cls =
1066+ (log_referer_state *) ap_palloc(p, sizeof(log_referer_state));
7a621ca3 1067
500394d0
JR		 1068 cls->fname = "";
1069 cls->referer_fd = -1;
1070@@ -88,10 +88,10 @@
1071 return (void *) cls;
7a621ca3 1072 }
500394d0
JR		 1073
1074-static const char *set_referer_log(cmd_parms *parms, void *dummy, char *arg)
1075+static const char *set_log_referer(cmd_parms *parms, void *dummy, char *arg)
7a621ca3 1076 {
500394d0
JR		 1077- referer_log_state *cls = ap_get_module_config(parms->server->module_config,
1078- &referer_log_module);
1079+ log_referer_state *cls = ap_get_module_config(parms->server->module_config,
1080+ &log_referer_module);
7a621ca3 1081
500394d0
JR		 1082 cls->fname = arg;
1083 return NULL;
1084@@ -100,8 +100,8 @@
1085 static const char *add_referer_ignore(cmd_parms *parms, void *dummy, char *arg)
7a621ca3 1086 {
500394d0
JR		 1087 char **addme;
1088- referer_log_state *cls = ap_get_module_config(parms->server->module_config,
1089- &referer_log_module);
1090+ log_referer_state *cls = ap_get_module_config(parms->server->module_config,
1091+ &log_referer_module);
7a621ca3 1092
500394d0
JR		 1093 addme = ap_push_array(cls->referer_ignore_list);
1094 ap_str_tolower(arg);
1095@@ -109,19 +109,19 @@
7a621ca3 1096 return NULL;
1097 }
1098
500394d0
JR		 1099-static const command_rec referer_log_cmds[] =
1100+static const command_rec log_referer_cmds[] =
7a621ca3 1101 {
500394d0
JR		 1102- {"RefererLog", set_referer_log, NULL, RSRC_CONF, TAKE1,
1103+ {"RefererLog", set_log_referer, NULL, RSRC_CONF, TAKE1,
1104 "the filename of the referer log"},
1105 {"RefererIgnore", add_referer_ignore, NULL, RSRC_CONF, ITERATE,
1106 "referer hostnames to ignore"},
7a621ca3 1107 {NULL}
1108 };
1109
500394d0
JR		 1110-static void open_referer_log(server_rec *s, pool *p)
1111+static void open_log_referer(server_rec *s, pool *p)
1112 {
1113- referer_log_state *cls = ap_get_module_config(s->module_config,
1114- &referer_log_module);
1115+ log_referer_state *cls = ap_get_module_config(s->module_config,
1116+ &log_referer_module);
7a621ca3 1117
500394d0
JR		 1118 char *fname = ap_server_root_relative(p, cls->fname);
1119
1120@@ -149,17 +149,17 @@
1121 }
1122 }
1123
1124-static void init_referer_log(server_rec *s, pool *p)
1125+static void init_log_referer(server_rec *s, pool *p)
7a621ca3 1126 {
500394d0
JR		 1127 for (; s; s = s->next)
1128- open_referer_log(s, p);
1129+ open_log_referer(s, p);
1130 }
1131
1132-static int referer_log_transaction(request_rec *orig)
1133+static int log_referer_transaction(request_rec *orig)
7a621ca3 1134 {
500394d0
JR		 1135 char **ptrptr, **ptrptr2;
1136- referer_log_state *cls = ap_get_module_config(orig->server->module_config,
1137- &referer_log_module);
1138+ log_referer_state *cls = ap_get_module_config(orig->server->module_config,
1139+ &log_referer_module);
7a621ca3 1140
500394d0
JR		 1141 char *str;
1142 const char *referer;
1143@@ -205,15 +205,15 @@
1144 return OK;
7a621ca3 1145 }
1146
500394d0
JR		 1147-module referer_log_module =
1148+module log_referer_module =
7a621ca3 1149 {
1150 STANDARD_MODULE_STUFF,
500394d0
JR		 1151- init_referer_log, /* initializer */
1152+ init_log_referer, /* initializer */
1153 NULL, /* create per-dir config */
1154 NULL, /* merge per-dir config */
1155- make_referer_log_state, /* server config */
1156+ make_log_referer_state, /* server config */
1157 NULL, /* merge server config */
1158- referer_log_cmds, /* command table */
1159+ log_referer_cmds, /* command table */
1160 NULL, /* handlers */
1161 NULL, /* filename translation */
1162 NULL, /* check_user_id */
1163@@ -221,7 +221,7 @@
1164 NULL, /* check access */
1165 NULL, /* type_checker */
1166 NULL, /* fixups */
1167- referer_log_transaction, /* logger */
1168+ log_referer_transaction, /* logger */
1169 NULL, /* header parser */
1170 NULL, /* child_init */
1171 NULL, /* child_exit */
c9d4ec50
JB		 1172--- apache_1.3.23/src/modules/experimental/mod_auth_digest.c.orig Thu Feb 8 00:43:50 2001
1173+++ apache_1.3.23/src/modules/experimental/mod_auth_digest.c Mon Mar 4 22:30:20 2002
1174@@ -97,7 +97,7 @@
1175
1176 /* The section for the Configure script:
1177 * MODULE-DEFINITION-START
1178- * Name: digest_auth_module
1179+ * Name: auth_digest_module
1180 * ConfigStart
1181
1182 RULE_DEV_RANDOM=`./helpers/CutRule DEV_RANDOM $file`
1183@@ -262,7 +262,7 @@
1184 static void *client_mm = NULL;
1185 #endif /* HAVE_SHMEM_MM */
1186
1187-module MODULE_VAR_EXPORT digest_auth_module;
1188+module MODULE_VAR_EXPORT auth_digest_module;
1189
1190 /*
1191 * initialization code
1192@@ -963,7 +963,7 @@
1193 resp->raw_request_uri = r->unparsed_uri;
1194 resp->psd_request_uri = &r->parsed_uri;
1195 resp->needed_auth = 0;
1196- ap_set_module_config(r->request_config, &digest_auth_module, resp);
1197+ ap_set_module_config(r->request_config, &auth_digest_module, resp);
1198
1199 res = get_digest_rec(r, resp);
1200 resp->client = get_client(resp->opaque_num, r);
1201@@ -1606,14 +1606,14 @@
1202 while (mainreq->main != NULL) mainreq = mainreq->main;
1203 while (mainreq->prev != NULL) mainreq = mainreq->prev;
1204 resp = (digest_header_rec *) ap_get_module_config(mainreq->request_config,
1205- &digest_auth_module);
1206+ &auth_digest_module);
1207 resp->needed_auth = 1;
1208
1209
1210 /* get our conf */
1211
1212 conf = (digest_config_rec *) ap_get_module_config(r->per_dir_config,
1213- &digest_auth_module);
1214+ &auth_digest_module);
1215
1216
1217 /* check for existence and syntax of Auth header */
1218@@ -1839,7 +1839,7 @@
1219 {
1220 const digest_config_rec *conf =
1221 (digest_config_rec *) ap_get_module_config(r->per_dir_config,
1222- &digest_auth_module);
1223+ &auth_digest_module);
1224 const char *user = r->connection->user;
1225 int m = r->method_number;
1226 int method_restricted = 0;
1227@@ -1909,7 +1909,7 @@
1228
1229 note_digest_auth_failure(r, conf,
1230 (digest_header_rec *) ap_get_module_config(r->request_config,
1231- &digest_auth_module),
1232+ &auth_digest_module),
1233 0);
1234 return AUTH_REQUIRED;
1235 }
1236@@ -1934,10 +1934,10 @@
1237 {
1238 const digest_config_rec *conf =
1239 (digest_config_rec *) ap_get_module_config(r->per_dir_config,
1240- &digest_auth_module);
1241+ &auth_digest_module);
1242 digest_header_rec *resp =
1243 (digest_header_rec *) ap_get_module_config(r->request_config,
1244- &digest_auth_module);
1245+ &auth_digest_module);
1246 const char *ai = NULL, *digest = NULL, *nextnonce = "";
1247
1248 if (resp == NULL || !resp->needed_auth || conf == NULL)
1249@@ -2076,7 +2076,7 @@
1250 }
1251
1252
1253-module MODULE_VAR_EXPORT digest_auth_module =
1254+module MODULE_VAR_EXPORT auth_digest_module =
1255 {
1256 STANDARD_MODULE_STUFF,
1257 initialize_module, /* initializer */
The most widely used Web server on the Internet
This page took 0.383594 seconds and 4 git commands to generate.