]> git.pld-linux.org Git - packages/apache.git/blame - apache-modules_symbols.patch
projects / packages / apache.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- based on config from mod_ssl
[packages/apache.git] / apache-modules_symbols.patch
CommitLineData
3c5510d3 1diff -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
4@@ -72,7 +72,7 @@
5 * instead of AuthDBMUserFile AuthDBMGroupFile
6 *
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
10 *
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
13@@ -111,12 +111,12 @@
14 char *auth_dbpwfile;
15 char *auth_dbgrpfile;
16 int auth_dbauthoritative;
17-} db_auth_config_rec;
18+} auth_db_config_rec;
19
20-static void *create_db_auth_dir_config(pool *p, char *d)
21+static void *create_auth_db_dir_config(pool *p, char *d)
22 {
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 */
30@@ -131,28 +131,28 @@
31 return ap_set_file_slot(cmd, offset, f);
32 }
33
34-static const command_rec db_auth_cmds[] =
35+static const command_rec auth_db_cmds[] =
36 {
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),
56 OR_AUTHCFG, FLAG,
57 "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"},
58 {NULL}
59 };
60
61-module db_auth_module;
62+module auth_db_module;
63
64 static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
65 {
66@@ -226,11 +226,11 @@
67 return grp_data;
68 }
69
70-static int db_authenticate_basic_user(request_rec *r)
71+static int authenticate_db_basic_user(request_rec *r)
72 {
73- db_auth_config_rec *sec =
74- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
75- &db_auth_module);
76+ auth_db_config_rec *sec =
77+ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
78+ &auth_db_module);
79 conn_rec *c = r->connection;
80 const char *sent_pw;
81 char *real_pw, *colon_pw;
82@@ -271,9 +271,9 @@
83
84 static int db_check_auth(request_rec *r)
85 {
86- db_auth_config_rec *sec =
87- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
88- &db_auth_module);
89+ auth_db_config_rec *sec =
90+ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config,
91+ &auth_db_module);
92 char *user = r->connection->user;
93 int m = r->method_number;
94
95@@ -331,18 +331,18 @@
96 }
97
98
99-module db_auth_module =
100+module auth_db_module =
101 {
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 */
111 NULL, /* handlers */
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 */
118diff -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
121@@ -106,7 +106,7 @@
122 #define RAW_ASCII_CHAR(ch) (ch)
123 #endif /*CHARSET_EBCDIC*/
124
125-module MODULE_VAR_EXPORT includes_module;
126+module MODULE_VAR_EXPORT include_module;
127
128 /* ------------------------ Environment function -------------------------- */
129
130@@ -728,7 +728,7 @@
131
132 /* see the Kludge in send_parsed_file for why */
133 if (rr)
134- ap_set_module_config(rr->request_config, &includes_module, r);
135+ ap_set_module_config(rr->request_config, &include_module, r);
136
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.
141 */
142
143-module includes_module;
144+module include_module;
145 enum xbithack {
146 xbithack_off, xbithack_on, xbithack_full
147 };
148@@ -2317,7 +2317,7 @@
149 #define DEFAULT_XBITHACK xbithack_off
150 #endif
151
152-static void *create_includes_dir_config(pool *p, char *dummy)
153+static void *create_include_dir_config(pool *p, char *dummy)
154 {
155 enum xbithack *result = (enum xbithack *) ap_palloc(p, sizeof(enum xbithack));
156 *result = DEFAULT_XBITHACK;
157@@ -2348,7 +2348,7 @@
158 {
159 FILE *f;
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);
163 int errstatus;
164 request_rec *parent;
165
166@@ -2419,7 +2419,7 @@
167 while (q) {
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);
172
173 /* Create the initial environment in the parent */
174 ap_add_common_vars(q);
175@@ -2441,7 +2441,7 @@
176 }
177 }
178
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 @@
185 }
186
187 state = (enum xbithack *) ap_get_module_config(r->per_dir_config,
188- &includes_module);
189+ &include_module);
190
191 if (*state == xbithack_off) {
192 return DECLINED;
193@@ -2520,13 +2520,13 @@
194 #endif
195 }
196
197-static const command_rec includes_cmds[] =
198+static const command_rec include_cmds[] =
199 {
200 {"XBitHack", set_xbithack, NULL, OR_OPTIONS, TAKE1, "Off, On, or Full"},
201 {NULL}
202 };
203
204-static const handler_rec includes_handlers[] =
205+static const handler_rec include_handlers[] =
206 {
207 {INCLUDES_MAGIC_TYPE, send_shtml_file},
208 {INCLUDES_MAGIC_TYPE3, send_shtml_file},
209@@ -2535,16 +2535,16 @@
210 {NULL}
211 };
212
213-module MODULE_VAR_EXPORT includes_module =
214+module MODULE_VAR_EXPORT include_module =
215 {
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 */
230diff -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
233@@ -87,7 +87,7 @@
234 * instead.
235 *
236 * MODULE-DEFINITION-START
237- * Name: dbm_auth_module
238+ * Name: auth_dbm_module
239 * ConfigStart
240 . ./helpers/find-dbm-lib
241 * ConfigEnd
242@@ -100,12 +100,12 @@
243 char *auth_dbmgrpfile;
244 int auth_dbmauthoritative;
245
246-} dbm_auth_config_rec;
247+} auth_dbm_config_rec;
248
249-static void *create_dbm_auth_dir_config(pool *p, char *d)
250+static void *create_auth_dbm_dir_config(pool *p, char *d)
251 {
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));
256
257 sec->auth_dbmpwfile = NULL;
258 sec->auth_dbmgrpfile = NULL;
259@@ -122,27 +122,27 @@
260 return ap_set_file_slot(cmd, offset, f);
261 }
262
263-static const command_rec dbm_auth_cmds[] =
264+static const command_rec auth_dbm_cmds[] =
265 {
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"},
286 {NULL}
287 };
288
289-module dbm_auth_module;
290+module auth_dbm_module;
291
292 static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
293 {
294@@ -205,11 +205,11 @@
295 return grp_data;
296 }
297
298-static int dbm_authenticate_basic_user(request_rec *r)
299+static int authenticate_dbm_basic_user(request_rec *r)
300 {
301- dbm_auth_config_rec *sec =
302- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
303- &dbm_auth_module);
304+ auth_dbm_config_rec *sec =
305+ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
306+ &auth_dbm_module);
307 conn_rec *c = r->connection;
308 const char *sent_pw;
309 char *real_pw, *colon_pw;
310@@ -250,9 +250,9 @@
311
312 static int dbm_check_auth(request_rec *r)
313 {
314- dbm_auth_config_rec *sec =
315- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
316- &dbm_auth_module);
317+ auth_dbm_config_rec *sec =
318+ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config,
319+ &auth_dbm_module);
320 char *user = r->connection->user;
321 int m = r->method_number;
322
323@@ -311,18 +311,18 @@
324 }
325
326
327-module dbm_auth_module =
328+module auth_dbm_module =
329 {
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 */
339 NULL, /* handlers */
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 */
346diff -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
349@@ -60,7 +60,7 @@
350 #include "http_config.h"
351 #include "http_log.h"
352
353-module agent_log_module;
354+module log_agent_module;
355
356 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
357 #ifdef OS2
358@@ -73,12 +73,12 @@
359 typedef struct {
360 char *fname;
361 int agent_fd;
362-} agent_log_state;
363+} log_agent_state;
364
365-static void *make_agent_log_state(pool *p, server_rec *s)
366+static void *make_log_agent_state(pool *p, server_rec *s)
367 {
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));
372
373 cls->fname = "";
374 cls->agent_fd = -1;
375@@ -86,26 +86,26 @@
376 return (void *) cls;
377 }
378
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)
381 {
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);
386
387 cls->fname = arg;
388 return NULL;
389 }
390
391-static const command_rec agent_log_cmds[] =
392+static const command_rec log_agent_cmds[] =
393 {
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"},
397 {NULL}
398 };
399
400-static void open_agent_log(server_rec *s, pool *p)
401+static void open_log_agent(server_rec *s, pool *p)
402 {
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);
407
408 char *fname = ap_server_root_relative(p, cls->fname);
409
410@@ -132,16 +132,16 @@
411 }
412 }
413
414-static void init_agent_log(server_rec *s, pool *p)
415+static void init_log_agent(server_rec *s, pool *p)
416 {
417 for (; s; s = s->next)
418- open_agent_log(s, p);
419+ open_log_agent(s, p);
420 }
421
422-static int agent_log_transaction(request_rec *orig)
423+static int log_agent_transaction(request_rec *orig)
424 {
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);
429
430 char str[HUGE_STRING_LEN];
431 const char *agent;
432@@ -164,15 +164,15 @@
433 return OK;
434 }
435
436-module agent_log_module =
437+module log_agent_module =
438 {
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 */
449 NULL, /* handlers */
450 NULL, /* filename translation */
451 NULL, /* check_user_id */
452@@ -180,7 +180,7 @@
453 NULL, /* check access */
454 NULL, /* type_checker */
455 NULL, /* fixups */
456- agent_log_transaction, /* logger */
457+ log_agent_transaction, /* logger */
458 NULL, /* header parser */
459 NULL, /* child_init */
460 NULL, /* child_exit */
461diff -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
464@@ -180,7 +180,7 @@
465 #include "http_log.h"
466 #include <limits.h>
467
468-module MODULE_VAR_EXPORT config_log_module;
469+module MODULE_VAR_EXPORT log_config_module;
470
471 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
472 #if defined(OS2) || defined(WIN32)
473@@ -207,29 +207,29 @@
474
475 /*
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.
483 *
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.
493 */
494
495 typedef struct {
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;
502 table *formats;
503 } multi_log_state;
504
505 /*
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
511@@ -247,7 +247,7 @@
512 int outcnt;
513 char outbuf[LOG_BUFSIZE];
514 #endif
515-} config_log_state;
516+} log_config_state;
517
518 /*
519 * Format items...
520@@ -803,7 +803,7 @@
521 }
522
523 #ifdef BUFFERED_LOGS
524-static void flush_log(config_log_state *cls)
525+static void flush_log(log_config_state *cls)
526 {
527 if (cls->outcnt && cls->log_fd != -1) {
528 write(cls->log_fd, cls->outbuf, cls->outcnt);
529@@ -812,7 +812,7 @@
530 }
531 #endif
532
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)
536 {
537 log_format_item *items;
538@@ -905,27 +905,27 @@
539 static int multi_log_transaction(request_rec *r)
540 {
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;
546 int i;
547
548 /*
549 * Log this transaction..
550 */
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];
559
560- config_log_transaction(r, cls, mls->default_format);
561+ log_config_transaction(r, cls, mls->default_format);
562 }
563 }
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];
572
573- config_log_transaction(r, cls, mls->default_format);
574+ log_config_transaction(r, cls, mls->default_format);
575 }
576 }
577
578@@ -937,15 +937,15 @@
579 * Module glue...
580 */
581
582-static void *make_config_log_state(pool *p, server_rec *s)
583+static void *make_log_config_state(pool *p, server_rec *s)
584 {
585 multi_log_state *mls;
586
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);
596
597@@ -958,12 +958,12 @@
598 * vhosts inherit any globally-defined format names.
599 */
600
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)
603 {
604 multi_log_state *base = (multi_log_state *) basev;
605 multi_log_state *add = (multi_log_state *) addv;
606
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;
612@@ -981,7 +981,7 @@
613 {
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);
618
619 /*
620 * If we were given two arguments, the second is a name to be given to the
621@@ -1007,10 +1007,10 @@
622 {
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;
629
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);
637 }
638
639-static const command_rec config_log_cmds[] =
640+static const command_rec log_config_cmds[] =
641 {
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 @@
645 {NULL}
646 };
647
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)
653 {
654 if (cls->log_fd > 0) {
655@@ -1096,12 +1096,12 @@
656 return cls;
657 }
658
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)
661 {
662 int i;
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;
668 const char *dummy;
669 const char *format;
670
671@@ -1116,10 +1116,10 @@
672 mls->default_format = parse_log_string(p, DEFAULT_LOG_FORMAT, &dummy);
673 }
674
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];
683
684 if (cls->format_string) {
685 format = ap_table_get(mls->formats, cls->format_string);
686@@ -1128,13 +1128,13 @@
687 }
688 }
689
690- cls = open_config_log(s, p, cls, mls->default_format);
691+ cls = open_log_config(s, p, cls, mls->default_format);
692 }
693 }
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];
702
703 if (cls->format_string) {
704 format = ap_table_get(mls->formats, cls->format_string);
705@@ -1143,14 +1143,14 @@
706 }
707 }
708
709- cls = open_config_log(s, p, cls, mls->default_format);
710+ cls = open_log_config(s, p, cls, mls->default_format);
711 }
712 }
713
714 return NULL;
715 }
716
717-static void init_config_log(server_rec *s, pool *p)
718+static void init_log_config(server_rec *s, pool *p)
719 {
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 @@
723 {
724 multi_log_state *mls;
725 array_header *log_list;
726- config_log_state *clsarray;
727+ log_config_state *clsarray;
728 int i;
729
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);
733 log_list = NULL;
734- if (mls->config_logs->nelts) {
735- log_list = mls->config_logs;
736+ if (mls->log_configs->nelts) {
737+ log_list = mls->log_configs;
738 }
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;
743 }
744 if (log_list) {
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]);
749 }
750@@ -1192,15 +1192,15 @@
751 }
752 #endif
753
754-module MODULE_VAR_EXPORT config_log_module =
755+module MODULE_VAR_EXPORT log_config_module =
756 {
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 */
768 NULL, /* handlers */
769 NULL, /* filename translation */
770 NULL, /* check_user_id */
771diff -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
774@@ -60,7 +60,7 @@
775 #include "http_config.h"
776 #include "http_log.h"
777
778-module referer_log_module;
779+module log_referer_module;
780
781 static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT);
782
783@@ -75,12 +75,12 @@
784 char *fname;
785 int referer_fd;
786 array_header *referer_ignore_list;
787-} referer_log_state;
788+} log_referer_state;
789
790-static void *make_referer_log_state(pool *p, server_rec *s)
791+static void *make_log_referer_state(pool *p, server_rec *s)
792 {
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));
797
798 cls->fname = "";
799 cls->referer_fd = -1;
800@@ -88,10 +88,10 @@
801 return (void *) cls;
802 }
803
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)
806 {
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);
811
812 cls->fname = arg;
813 return NULL;
814@@ -100,8 +100,8 @@
815 static const char *add_referer_ignore(cmd_parms *parms, void *dummy, char *arg)
816 {
817 char **addme;
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);
822
823 addme = ap_push_array(cls->referer_ignore_list);
824 ap_str_tolower(arg);
825@@ -109,19 +109,19 @@
826 return NULL;
827 }
828
829-static const command_rec referer_log_cmds[] =
830+static const command_rec log_referer_cmds[] =
831 {
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"},
837 {NULL}
838 };
839
840-static void open_referer_log(server_rec *s, pool *p)
841+static void open_log_referer(server_rec *s, pool *p)
842 {
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);
847
848 char *fname = ap_server_root_relative(p, cls->fname);
849
850@@ -149,17 +149,17 @@
851 }
852 }
853
854-static void init_referer_log(server_rec *s, pool *p)
855+static void init_log_referer(server_rec *s, pool *p)
856 {
857 for (; s; s = s->next)
858- open_referer_log(s, p);
859+ open_log_referer(s, p);
860 }
861
862-static int referer_log_transaction(request_rec *orig)
863+static int log_referer_transaction(request_rec *orig)
864 {
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);
870
871 char *str;
872 const char *referer;
873@@ -205,15 +205,15 @@
874 return OK;
875 }
876
877-module referer_log_module =
878+module log_referer_module =
879 {
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 */
890 NULL, /* handlers */
891 NULL, /* filename translation */
892 NULL, /* check_user_id */
893@@ -221,7 +221,7 @@
894 NULL, /* check access */
895 NULL, /* type_checker */
896 NULL, /* fixups */
897- referer_log_transaction, /* logger */
898+ log_referer_transaction, /* logger */
899 NULL, /* header parser */
900 NULL, /* child_init */
901 NULL, /* child_exit */
902diff -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
905@@ -96,34 +96,34 @@
906 * track extension method mappings -- table keys are case-INsensitive.
907 */
908 typedef struct {
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;
915
916-module action_module;
917+module actions_module;
918
919-static void *create_action_dir_config(pool *p, char *dummy)
920+static void *create_actions_dir_config(pool *p, char *dummy)
921 {
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));
926
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));
931 return new;
932 }
933
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)
936 {
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));
945 int i;
946
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);
951
952 for (i = 0; i < METHODS; ++i) {
953 new->scripted[i] = add->scripted[i] ? add->scripted[i]
954@@ -133,14 +133,14 @@
955 return new;
956 }
957
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,
960 char *script)
961 {
962- ap_table_setn(m->action_types, type, script);
963+ ap_table_setn(m->actions_types, type, script);
964 return NULL;
965 }
966
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)
970 {
971 int methnum;
972@@ -182,20 +182,20 @@
973 return NULL;
974 }
975
976-static const command_rec action_cmds[] =
977+static const command_rec actions_cmds[] =
978 {
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"},
984 {NULL}
985 };
986
987-static int action_handler(request_rec *r)
988+static int actions_handler(request_rec *r)
989 {
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);
997 const char *script;
998 int i;
999@@ -242,9 +242,9 @@
1000 return DECLINED;
1001 }
1002
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)))) {
1009 script = t;
1010 }
1011
1012@@ -260,22 +260,22 @@
1013 return OK;
1014 }
1015
1016-static const handler_rec action_handlers[] =
1017+static const handler_rec actions_handlers[] =
1018 {
1019- {"*/*", action_handler},
1020+ {"*/*", actions_handler},
1021 {NULL}
1022 };
1023
1024-module action_module =
1025+module actions_module =
1026 {
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 */
1042diff -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;
1048
1049-} anon_auth_config_rec;
1050+} auth_anon_config_rec;
1051
1052-static void *create_anon_auth_dir_config(pool *p, char *d)
1053+static void *create_auth_anon_dir_config(pool *p, char *d)
1054 {
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));
1059
1060 if (!sec)
1061 return NULL; /* no memory... */
1062@@ -136,39 +136,39 @@
1063 }
1064
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)
1068 {
1069 sec->auth_anon_mustemail = arg;
1070 return NULL;
1071 }
1072
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)
1076 {
1077 sec->auth_anon_nouserid = arg;
1078 return NULL;
1079 }
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)
1083 {
1084 sec->auth_anon_logemail = arg;
1085 return NULL;
1086 }
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)
1090 {
1091 sec->auth_anon_verifyemail = arg;
1092 return NULL;
1093 }
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)
1097 {
1098 sec->auth_anon_authoritative = arg;
1099 return NULL;
1100 }
1101
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)
1105 {
1106
1107 auth_anon *first;
1108@@ -191,7 +191,7 @@
1109 return NULL;
1110 }
1111
1112-static const command_rec anon_auth_cmds[] =
1113+static const command_rec auth_anon_cmds[] =
1114 {
1115 {"Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, ITERATE,
1116 "a space-separated list of user IDs"},
1117@@ -209,13 +209,13 @@
1118 {NULL}
1119 };
1120
1121-module MODULE_VAR_EXPORT anon_auth_module;
1122+module MODULE_VAR_EXPORT auth_anon_module;
1123
1124-static int anon_authenticate_basic_user(request_rec *r)
1125+static int authenticate_anon_basic_user(request_rec *r)
1126 {
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;
1135 int res = DECLINED;
1136@@ -275,9 +275,9 @@
1137 {
1138 #ifdef NOTYET
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);
1146
1147 if (!sec->auth_anon)
1148 return DECLINED;
1149@@ -291,18 +291,18 @@
1150 }
1151
1152
1153-module MODULE_VAR_EXPORT anon_auth_module =
1154+module MODULE_VAR_EXPORT auth_anon_module =
1155 {
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 */
The most widely used Web server on the Internet
This page took 0.610485 seconds and 4 git commands to generate.