From: Jan Rękorajski Date: Mon, 13 Nov 2000 16:50:47 +0000 (+0000) Subject: - updated to 1.3.14 X-Git-Tag: apache-1_3_14-2 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=500394d0dfccf1484ac8d2c0a6faaa4e9ca1719f;hp=3a13f014d350c9875eabec4a9789d70358e627d9;p=packages%2Fapache1.git - updated to 1.3.14 Changed files: apache-PLD.patch -> 1.2 apache-db3.patch -> 1.2 apache-modules_symbols.patch -> 1.2 --- diff --git a/apache-PLD.patch b/apache-PLD.patch index 2b6eacf..34ed325 100644 --- a/apache-PLD.patch +++ b/apache-PLD.patch @@ -1,21 +1,11 @@ ---- apache_1.3.6/src/main/http_main.c.redhat Wed Mar 17 18:05:43 1999 -+++ apache_1.3.6/src/main/http_main.c Thu Mar 25 17:24:55 1999 -@@ -404,6 +404,9 @@ - else { - ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")"); - } -+ -+ ap_add_version_component(" (PLD/Linux)"); -+ - /* - * Lock the server_version string if we're not displaying - * the full set of tokens ---- apache_1.3.9/config.layout.pld Thu Jul 29 20:12:43 1999 -+++ apache_1.3.9/config.layout Mon Aug 23 19:29:39 1999 -@@ -150,3 +150,22 @@ - proxycachedir: $localstatedir/proxy +diff -urN apache_1.3.14.orig/config.layout apache_1.3.14/config.layout +--- apache_1.3.14.orig/config.layout Tue Sep 26 01:44:55 2000 ++++ apache_1.3.14/config.layout Sat Nov 11 20:41:04 2000 +@@ -249,3 +249,23 @@ + logfiledir: $prefix/logs + proxycachedir: $prefix/proxy - ++ +# PLD layout... + + prefix: /usr @@ -35,3 +25,16 @@ + logfiledir: $localstatedir/log/httpd + proxycachedir: $localstatedir/cache/www/apache + +diff -urN apache_1.3.14.orig/src/main/http_main.c apache_1.3.14/src/main/http_main.c +--- apache_1.3.14.orig/src/main/http_main.c Thu Sep 28 15:32:36 2000 ++++ apache_1.3.14/src/main/http_main.c Sat Nov 11 20:39:48 2000 +@@ -432,6 +432,9 @@ + else { + ap_add_version_component(SERVER_BASEVERSION " (" PLATFORM ")"); + } ++ ++ ap_add_version_component(" (PLD/Linux)"); ++ + /* + * Lock the server_version string if we're not displaying + * the full set of tokens diff --git a/apache-db3.patch b/apache-db3.patch index f1b7e47..bf6f6a8 100644 --- a/apache-db3.patch +++ b/apache-db3.patch @@ -1,14 +1,15 @@ ---- apache_1.3.12/src/modules/standard/mod_auth_dbm.c~ Mon Sep 25 20:50:01 2000 -+++ apache_1.3.12/src/modules/standard/mod_auth_dbm.c Mon Sep 25 21:05:00 2000 -@@ -75,8 +75,12 @@ - #include "http_log.h" - #include "http_protocol.h" - #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \ +diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c apache_1.3.14/src/modules/standard/mod_auth_dbm.c +--- apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c Sat Nov 11 22:58:04 2000 ++++ apache_1.3.14/src/modules/standard/mod_auth_dbm.c Sat Nov 11 22:59:52 2000 +@@ -80,8 +80,12 @@ + #define dbm_fetch sdbm_fetch + #define dbm_close sdbm_close + #elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \ - && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 + && __GLIBC__ >= 2 && __GLIBC_MINOR__ == 1 #include +#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \ -+ && __GLIBC__ >= 2 && __GLIBC_MINOR__ == 2 ++ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 2 +#define DB_DBM_HSEARCH 1 +#include #else diff --git a/apache-modules_symbols.patch b/apache-modules_symbols.patch index 1dd75e3..a498305 100644 --- a/apache-modules_symbols.patch +++ b/apache-modules_symbols.patch @@ -1,376 +1,646 @@ -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 ---- apache_1.3.12/src/modules/standard/mod_auth_db.c Sun Nov 28 13:59:51 1999 -+++ apache_1.3.12.new/src/modules/standard/mod_auth_db.c Sun Apr 2 23:51:16 2000 -@@ -72,7 +72,7 @@ - * instead of AuthDBMUserFile AuthDBMGroupFile - * - * Also, in the configuration file you need to specify -- * db_auth_module rather than dbm_auth_module -+ * auth_db_module rather than auth_dbm_module - * - * On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically - * mapped to Berkeley DB. You can use either mod_auth_dbm or -@@ -111,12 +111,12 @@ - char *auth_dbpwfile; - char *auth_dbgrpfile; - int auth_dbauthoritative; --} db_auth_config_rec; -+} auth_db_config_rec; +diff -urN apache_1.3.14.orig/src/modules/standard/mod_actions.c apache_1.3.14/src/modules/standard/mod_actions.c +--- apache_1.3.14.orig/src/modules/standard/mod_actions.c Wed Feb 2 21:44:00 2000 ++++ apache_1.3.14/src/modules/standard/mod_actions.c Sat Nov 11 22:52:25 2000 +@@ -96,34 +96,34 @@ + * track extension method mappings -- table keys are case-INsensitive. + */ + typedef struct { +- table *action_types; /* Added with Action... */ ++ table *actions_types; /* Added with Action... */ + char *scripted[METHODS]; /* Added with Script... */ + array_header *xmethods; /* Added with Script -- extension methods */ +-} action_dir_config; ++} actions_dir_config; --static void *create_db_auth_dir_config(pool *p, char *d) -+static void *create_auth_db_dir_config(pool *p, char *d) +-module action_module; ++module actions_module; + +-static void *create_action_dir_config(pool *p, char *dummy) ++static void *create_actions_dir_config(pool *p, char *dummy) { -- db_auth_config_rec *sec -- = (db_auth_config_rec *) ap_pcalloc(p, sizeof(db_auth_config_rec)); -+ auth_db_config_rec *sec -+ = (auth_db_config_rec *) ap_pcalloc(p, sizeof(auth_db_config_rec)); - sec->auth_dbpwfile = NULL; - sec->auth_dbgrpfile = NULL; - sec->auth_dbauthoritative = 1; /* fortress is secure by default */ -@@ -131,28 +131,28 @@ - return ap_set_file_slot(cmd, offset, f); +- action_dir_config *new = +- (action_dir_config *) ap_palloc(p, sizeof(action_dir_config)); ++ actions_dir_config *new = ++ (actions_dir_config *) ap_palloc(p, sizeof(actions_dir_config)); + +- new->action_types = ap_make_table(p, 4); ++ new->actions_types = ap_make_table(p, 4); + memset(new->scripted, 0, sizeof(new->scripted)); + new->xmethods = ap_make_array(p, 4, sizeof(xmethod_t)); + return new; } --static const command_rec db_auth_cmds[] = -+static const command_rec auth_db_cmds[] = +-static void *merge_action_dir_configs(pool *p, void *basev, void *addv) ++static void *merge_actions_dir_configs(pool *p, void *basev, void *addv) { - {"AuthDBUserFile", ap_set_file_slot, -- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile), -+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile), - OR_AUTHCFG, TAKE1, NULL}, - {"AuthDBGroupFile", ap_set_file_slot, -- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile), -+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile), - OR_AUTHCFG, TAKE1, NULL}, - {"AuthUserFile", set_db_slot, -- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile), -+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile), - OR_AUTHCFG, TAKE12, NULL}, - {"AuthGroupFile", set_db_slot, -- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile), -+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile), - OR_AUTHCFG, TAKE12, NULL}, - {"AuthDBAuthoritative", ap_set_flag_slot, -- (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative), -+ (void *) XtOffsetOf(auth_db_config_rec, auth_dbauthoritative), - OR_AUTHCFG, FLAG, - "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"}, - {NULL} - }; +- action_dir_config *base = (action_dir_config *) basev; +- action_dir_config *add = (action_dir_config *) addv; +- action_dir_config *new = (action_dir_config *) ap_palloc(p, +- sizeof(action_dir_config)); ++ actions_dir_config *base = (actions_dir_config *) basev; ++ actions_dir_config *add = (actions_dir_config *) addv; ++ actions_dir_config *new = (actions_dir_config *) ap_palloc(p, ++ sizeof(actions_dir_config)); + int i; --module db_auth_module; -+module auth_db_module; +- new->action_types = ap_overlay_tables(p, add->action_types, +- base->action_types); ++ new->actions_types = ap_overlay_tables(p, add->actions_types, ++ base->actions_types); - static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile) - { -@@ -226,11 +226,11 @@ - return grp_data; + for (i = 0; i < METHODS; ++i) { + new->scripted[i] = add->scripted[i] ? add->scripted[i] +@@ -133,14 +133,14 @@ + return new; } --static int db_authenticate_basic_user(request_rec *r) -+static int authenticate_db_basic_user(request_rec *r) +-static const char *add_action(cmd_parms *cmd, action_dir_config *m, char *type, ++static const char *add_actions(cmd_parms *cmd, actions_dir_config *m, char *type, + char *script) { -- db_auth_config_rec *sec = -- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config, -- &db_auth_module); -+ auth_db_config_rec *sec = -+ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config, -+ &auth_db_module); - conn_rec *c = r->connection; - const char *sent_pw; - char *real_pw, *colon_pw; -@@ -271,9 +271,9 @@ +- ap_table_setn(m->action_types, type, script); ++ ap_table_setn(m->actions_types, type, script); + return NULL; + } - static int db_check_auth(request_rec *r) +-static const char *set_script(cmd_parms *cmd, action_dir_config *m, ++static const char *set_script(cmd_parms *cmd, actions_dir_config *m, + char *method, char *script) { -- db_auth_config_rec *sec = -- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config, -- &db_auth_module); -+ auth_db_config_rec *sec = -+ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config, -+ &auth_db_module); - char *user = r->connection->user; - int m = r->method_number; - -@@ -331,18 +331,18 @@ + int methnum; +@@ -182,20 +182,20 @@ + return NULL; } - --module db_auth_module = -+module auth_db_module = +-static const command_rec action_cmds[] = ++static const command_rec actions_cmds[] = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ -- create_db_auth_dir_config, /* dir config creater */ -+ create_auth_db_dir_config, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - NULL, /* server config */ - NULL, /* merge server config */ -- db_auth_cmds, /* command table */ -+ auth_db_cmds, /* command table */ - NULL, /* handlers */ - NULL, /* filename translation */ -- db_authenticate_basic_user, /* check_user_id */ -+ authenticate_db_basic_user, /* check_user_id */ - db_check_auth, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ -diff -Nru apache_1.3.12/src/modules/standard/mod_include.c apache_1.3.12.new/src/modules/standard/mod_include.c ---- apache_1.3.12/src/modules/standard/mod_include.c Wed Feb 2 21:44:03 2000 -+++ apache_1.3.12.new/src/modules/standard/mod_include.c Sun Apr 2 23:31:33 2000 -@@ -106,7 +106,7 @@ - #define RAW_ASCII_CHAR(ch) (ch) - #endif /*CHARSET_EBCDIC*/ - --module MODULE_VAR_EXPORT includes_module; -+module MODULE_VAR_EXPORT include_module; - - /* ------------------------ Environment function -------------------------- */ - -@@ -728,7 +728,7 @@ - - /* see the Kludge in send_parsed_file for why */ - if (rr) -- ap_set_module_config(rr->request_config, &includes_module, r); -+ ap_set_module_config(rr->request_config, &include_module, r); - - if (!error_fmt && ap_run_sub_req(rr)) { - error_fmt = "unable to include \"%s\" in parsed file %s"; -@@ -2306,7 +2306,7 @@ - * option only changes the default. - */ - --module includes_module; -+module include_module; - enum xbithack { - xbithack_off, xbithack_on, xbithack_full +- {"Action", add_action, NULL, OR_FILEINFO, TAKE2, ++ {"Action", add_actions, NULL, OR_FILEINFO, TAKE2, + "a media type followed by a script name"}, + {"Script", set_script, NULL, ACCESS_CONF | RSRC_CONF, TAKE2, + "a method followed by a script name"}, + {NULL} }; -@@ -2317,7 +2317,7 @@ - #define DEFAULT_XBITHACK xbithack_off - #endif --static void *create_includes_dir_config(pool *p, char *dummy) -+static void *create_include_dir_config(pool *p, char *dummy) - { - enum xbithack *result = (enum xbithack *) ap_palloc(p, sizeof(enum xbithack)); - *result = DEFAULT_XBITHACK; -@@ -2348,7 +2348,7 @@ +-static int action_handler(request_rec *r) ++static int actions_handler(request_rec *r) { - FILE *f; - enum xbithack *state = -- (enum xbithack *) ap_get_module_config(r->per_dir_config, &includes_module); -+ (enum xbithack *) ap_get_module_config(r->per_dir_config, &include_module); - int errstatus; - request_rec *parent; - -@@ -2419,7 +2419,7 @@ - while (q) { - if (ap_table_get(q->notes, PARENT_STRING)) { - /* Kludge --- See below */ -- ap_set_module_config(r->request_config, &includes_module, q); -+ ap_set_module_config(r->request_config, &include_module, q); - - /* Create the initial environment in the parent */ - ap_add_common_vars(q); -@@ -2441,7 +2441,7 @@ - } +- action_dir_config *conf = (action_dir_config *) +- ap_get_module_config(r->per_dir_config, &action_module); +- const char *t, *action = r->handler ? r->handler : ++ actions_dir_config *conf = (actions_dir_config *) ++ ap_get_module_config(r->per_dir_config, &actions_module); ++ const char *t, *actions = r->handler ? r->handler : + ap_field_noparam(r->pool, r->content_type); + const char *script; + int i; +@@ -242,9 +242,9 @@ + return DECLINED; } -- if ((parent = ap_get_module_config(r->request_config, &includes_module))) { -+ if ((parent = ap_get_module_config(r->request_config, &include_module))) { - /* Kludge --- for nested includes, we want to keep the subprocess - * environment of the base document (for compatibility); that means - * torquing our own last_modified date as well so that the -@@ -2511,7 +2511,7 @@ +- /* Second, check for actions (which override the method scripts) */ +- if ((t = ap_table_get(conf->action_types, +- action ? action : ap_default_type(r)))) { ++ /* Second, check for actionss (which override the method scripts) */ ++ if ((t = ap_table_get(conf->actions_types, ++ actions ? actions : ap_default_type(r)))) { + script = t; } - state = (enum xbithack *) ap_get_module_config(r->per_dir_config, -- &includes_module); -+ &include_module); - - if (*state == xbithack_off) { - return DECLINED; -@@ -2520,13 +2520,13 @@ - #endif +@@ -260,22 +260,22 @@ + return OK; } --static const command_rec includes_cmds[] = -+static const command_rec include_cmds[] = +-static const handler_rec action_handlers[] = ++static const handler_rec actions_handlers[] = { - {"XBitHack", set_xbithack, NULL, OR_OPTIONS, TAKE1, "Off, On, or Full"}, +- {"*/*", action_handler}, ++ {"*/*", actions_handler}, {NULL} }; --static const handler_rec includes_handlers[] = -+static const handler_rec include_handlers[] = - { - {INCLUDES_MAGIC_TYPE, send_shtml_file}, - {INCLUDES_MAGIC_TYPE3, send_shtml_file}, -@@ -2535,16 +2535,16 @@ - {NULL} - }; - --module MODULE_VAR_EXPORT includes_module = -+module MODULE_VAR_EXPORT include_module = +-module action_module = ++module actions_module = { STANDARD_MODULE_STUFF, - NULL, /* initializer */ -- create_includes_dir_config, /* dir config creater */ -+ create_include_dir_config, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - NULL, /* server config */ - NULL, /* merge server config */ -- includes_cmds, /* command table */ -- includes_handlers, /* handlers */ -+ include_cmds, /* command table */ -+ include_handlers, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ -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 ---- apache_1.3.12/src/modules/standard/mod_auth_dbm.c Mon Aug 2 22:50:22 1999 -+++ apache_1.3.12.new/src/modules/standard/mod_auth_dbm.c Mon Apr 3 00:15:09 2000 -@@ -87,7 +87,7 @@ - * instead. - * - * MODULE-DEFINITION-START -- * Name: dbm_auth_module -+ * Name: auth_dbm_module - * ConfigStart - . ./helpers/find-dbm-lib - * ConfigEnd -@@ -100,12 +100,12 @@ - char *auth_dbmgrpfile; - int auth_dbmauthoritative; + NULL, /* initializer */ +- create_action_dir_config, /* dir config creater */ +- merge_action_dir_configs, /* dir merger --- default is to override */ ++ create_actions_dir_config, /* dir config creater */ ++ merge_actions_dir_configs, /* dir merger --- default is to override */ + NULL, /* server config */ + NULL, /* merge server config */ +- action_cmds, /* command table */ +- action_handlers, /* handlers */ ++ actions_cmds, /* command table */ ++ actions_handlers, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ + NULL, /* check auth */ +diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_anon.c apache_1.3.14/src/modules/standard/mod_auth_anon.c +--- apache_1.3.14.orig/src/modules/standard/mod_auth_anon.c Fri Jun 2 01:42:27 2000 ++++ apache_1.3.14/src/modules/standard/mod_auth_anon.c Sat Nov 11 22:52:25 2000 +@@ -114,12 +114,12 @@ + int auth_anon_mustemail; + int auth_anon_authoritative; --} dbm_auth_config_rec; -+} auth_dbm_config_rec; +-} anon_auth_config_rec; ++} auth_anon_config_rec; --static void *create_dbm_auth_dir_config(pool *p, char *d) -+static void *create_auth_dbm_dir_config(pool *p, char *d) +-static void *create_anon_auth_dir_config(pool *p, char *d) ++static void *create_auth_anon_dir_config(pool *p, char *d) { -- dbm_auth_config_rec *sec -- = (dbm_auth_config_rec *) ap_pcalloc(p, sizeof(dbm_auth_config_rec)); -+ auth_dbm_config_rec *sec -+ = (auth_dbm_config_rec *) ap_pcalloc(p, sizeof(auth_dbm_config_rec)); +- anon_auth_config_rec *sec = (anon_auth_config_rec *) +- ap_pcalloc(p, sizeof(anon_auth_config_rec)); ++ auth_anon_config_rec *sec = (auth_anon_config_rec *) ++ ap_pcalloc(p, sizeof(auth_anon_config_rec)); - sec->auth_dbmpwfile = NULL; - sec->auth_dbmgrpfile = NULL; -@@ -122,27 +122,27 @@ - return ap_set_file_slot(cmd, offset, f); + if (!sec) + return NULL; /* no memory... */ +@@ -136,39 +136,39 @@ } --static const command_rec dbm_auth_cmds[] = -+static const command_rec auth_dbm_cmds[] = + static const char *anon_set_passwd_flag(cmd_parms *cmd, +- anon_auth_config_rec * sec, int arg) ++ auth_anon_config_rec * sec, int arg) { - {"AuthDBMUserFile", ap_set_file_slot, -- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile), -+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile), - OR_AUTHCFG, TAKE1, NULL}, - {"AuthDBMGroupFile", ap_set_file_slot, -- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile), -+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile), - OR_AUTHCFG, TAKE1, NULL}, - {"AuthUserFile", set_dbm_slot, -- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile), -+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile), - OR_AUTHCFG, TAKE12, NULL}, - {"AuthGroupFile", set_dbm_slot, -- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile), -+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile), - OR_AUTHCFG, TAKE12, NULL}, - {"AuthDBMAuthoritative", ap_set_flag_slot, -- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative), -+ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmauthoritative), - 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"}, - {NULL} - }; + sec->auth_anon_mustemail = arg; + return NULL; + } --module dbm_auth_module; -+module auth_dbm_module; + static const char *anon_set_userid_flag(cmd_parms *cmd, +- anon_auth_config_rec * sec, int arg) ++ auth_anon_config_rec * sec, int arg) + { + sec->auth_anon_nouserid = arg; + return NULL; + } + static const char *anon_set_logemail_flag(cmd_parms *cmd, +- anon_auth_config_rec * sec, int arg) ++ auth_anon_config_rec * sec, int arg) + { + sec->auth_anon_logemail = arg; + return NULL; + } + static const char *anon_set_verifyemail_flag(cmd_parms *cmd, +- anon_auth_config_rec * sec, int arg) ++ auth_anon_config_rec * sec, int arg) + { + sec->auth_anon_verifyemail = arg; + return NULL; + } + static const char *anon_set_authoritative_flag(cmd_parms *cmd, +- anon_auth_config_rec * sec, int arg) ++ auth_anon_config_rec * sec, int arg) + { + sec->auth_anon_authoritative = arg; + return NULL; + } - static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile) + static const char *anon_set_string_slots(cmd_parms *cmd, +- anon_auth_config_rec * sec, char *arg) ++ auth_anon_config_rec * sec, char *arg) { -@@ -205,11 +205,11 @@ - return grp_data; + + auth_anon *first; +@@ -191,7 +191,7 @@ + return NULL; } --static int dbm_authenticate_basic_user(request_rec *r) -+static int authenticate_dbm_basic_user(request_rec *r) +-static const command_rec anon_auth_cmds[] = ++static const command_rec auth_anon_cmds[] = { -- dbm_auth_config_rec *sec = -- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config, -- &dbm_auth_module); -+ auth_dbm_config_rec *sec = -+ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config, -+ &auth_dbm_module); + {"Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, ITERATE, + "a space-separated list of user IDs"}, +@@ -209,13 +209,13 @@ + {NULL} + }; + +-module MODULE_VAR_EXPORT anon_auth_module; ++module MODULE_VAR_EXPORT auth_anon_module; + +-static int anon_authenticate_basic_user(request_rec *r) ++static int authenticate_anon_basic_user(request_rec *r) + { +- anon_auth_config_rec *sec = +- (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config, +- &anon_auth_module); ++ auth_anon_config_rec *sec = ++ (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config, ++ &auth_anon_module); conn_rec *c = r->connection; const char *sent_pw; - char *real_pw, *colon_pw; -@@ -250,9 +250,9 @@ - - static int dbm_check_auth(request_rec *r) + int res = DECLINED; +@@ -275,9 +275,9 @@ { -- dbm_auth_config_rec *sec = -- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config, -- &dbm_auth_module); -+ auth_dbm_config_rec *sec = -+ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config, -+ &auth_dbm_module); - char *user = r->connection->user; - int m = r->method_number; + #ifdef NOTYET + conn_rec *c = r->connection; +- anon_auth_config_rec *sec = +- (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config, +- &anon_auth_module); ++ auth_anon_config_rec *sec = ++ (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config, ++ &auth_anon_module); -@@ -311,18 +311,18 @@ + if (!sec->auth_anon) + return DECLINED; +@@ -291,18 +291,18 @@ } --module dbm_auth_module = -+module auth_dbm_module = +-module MODULE_VAR_EXPORT anon_auth_module = ++module MODULE_VAR_EXPORT auth_anon_module = { STANDARD_MODULE_STUFF, NULL, /* initializer */ -- create_dbm_auth_dir_config, /* dir config creater */ -+ create_auth_dbm_dir_config, /* dir config creater */ - NULL, /* dir merger --- default is to override */ +- create_anon_auth_dir_config, /* dir config creater */ ++ create_auth_anon_dir_config, /* dir config creater */ + NULL, /* dir merger ensure strictness */ NULL, /* server config */ NULL, /* merge server config */ -- dbm_auth_cmds, /* command table */ -+ auth_dbm_cmds, /* command table */ +- anon_auth_cmds, /* command table */ ++ auth_anon_cmds, /* command table */ NULL, /* handlers */ NULL, /* filename translation */ -- dbm_authenticate_basic_user, /* check_user_id */ -+ authenticate_dbm_basic_user, /* check_user_id */ - dbm_check_auth, /* check auth */ +- anon_authenticate_basic_user, /* check_user_id */ ++ authenticate_anon_basic_user, /* check_user_id */ + check_anon_access, /* check auth */ NULL, /* check access */ NULL, /* type_checker */ -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 ---- apache_1.3.12/src/modules/standard/mod_log_agent.c Fri Jan 1 20:05:10 1999 -+++ apache_1.3.12.new/src/modules/standard/mod_log_agent.c Mon Apr 3 00:21:51 2000 -@@ -60,7 +60,7 @@ - #include "http_config.h" - #include "http_log.h" - --module agent_log_module; -+module log_agent_module; - - static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT); - #ifdef OS2 -@@ -73,12 +73,12 @@ - typedef struct { - char *fname; - int agent_fd; --} agent_log_state; -+} log_agent_state; +diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_db.c apache_1.3.14/src/modules/standard/mod_auth_db.c +--- apache_1.3.14.orig/src/modules/standard/mod_auth_db.c Sun Nov 28 13:59:51 1999 ++++ apache_1.3.14/src/modules/standard/mod_auth_db.c Sat Nov 11 22:52:25 2000 +@@ -72,7 +72,7 @@ + * instead of AuthDBMUserFile AuthDBMGroupFile + * + * Also, in the configuration file you need to specify +- * db_auth_module rather than dbm_auth_module ++ * auth_db_module rather than auth_dbm_module + * + * On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically + * mapped to Berkeley DB. You can use either mod_auth_dbm or +@@ -111,12 +111,12 @@ + char *auth_dbpwfile; + char *auth_dbgrpfile; + int auth_dbauthoritative; +-} db_auth_config_rec; ++} auth_db_config_rec; --static void *make_agent_log_state(pool *p, server_rec *s) -+static void *make_log_agent_state(pool *p, server_rec *s) +-static void *create_db_auth_dir_config(pool *p, char *d) ++static void *create_auth_db_dir_config(pool *p, char *d) { -- agent_log_state *cls = -- (agent_log_state *) ap_palloc(p, sizeof(agent_log_state)); -+ log_agent_state *cls = -+ (log_agent_state *) ap_palloc(p, sizeof(log_agent_state)); +- db_auth_config_rec *sec +- = (db_auth_config_rec *) ap_pcalloc(p, sizeof(db_auth_config_rec)); ++ auth_db_config_rec *sec ++ = (auth_db_config_rec *) ap_pcalloc(p, sizeof(auth_db_config_rec)); + sec->auth_dbpwfile = NULL; + sec->auth_dbgrpfile = NULL; + sec->auth_dbauthoritative = 1; /* fortress is secure by default */ +@@ -131,28 +131,28 @@ + return ap_set_file_slot(cmd, offset, f); + } - cls->fname = ""; +-static const command_rec db_auth_cmds[] = ++static const command_rec auth_db_cmds[] = + { + {"AuthDBUserFile", ap_set_file_slot, +- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile), ++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile), + OR_AUTHCFG, TAKE1, NULL}, + {"AuthDBGroupFile", ap_set_file_slot, +- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile), ++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile), + OR_AUTHCFG, TAKE1, NULL}, + {"AuthUserFile", set_db_slot, +- (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile), ++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbpwfile), + OR_AUTHCFG, TAKE12, NULL}, + {"AuthGroupFile", set_db_slot, +- (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile), ++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbgrpfile), + OR_AUTHCFG, TAKE12, NULL}, + {"AuthDBAuthoritative", ap_set_flag_slot, +- (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative), ++ (void *) XtOffsetOf(auth_db_config_rec, auth_dbauthoritative), + OR_AUTHCFG, FLAG, + "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"}, + {NULL} + }; + +-module db_auth_module; ++module auth_db_module; + + static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile) + { +@@ -226,11 +226,11 @@ + return grp_data; + } + +-static int db_authenticate_basic_user(request_rec *r) ++static int authenticate_db_basic_user(request_rec *r) + { +- db_auth_config_rec *sec = +- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config, +- &db_auth_module); ++ auth_db_config_rec *sec = ++ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config, ++ &auth_db_module); + conn_rec *c = r->connection; + const char *sent_pw; + char *real_pw, *colon_pw; +@@ -271,9 +271,9 @@ + + static int db_check_auth(request_rec *r) + { +- db_auth_config_rec *sec = +- (db_auth_config_rec *) ap_get_module_config(r->per_dir_config, +- &db_auth_module); ++ auth_db_config_rec *sec = ++ (auth_db_config_rec *) ap_get_module_config(r->per_dir_config, ++ &auth_db_module); + char *user = r->connection->user; + int m = r->method_number; + +@@ -331,18 +331,18 @@ + } + + +-module db_auth_module = ++module auth_db_module = + { + STANDARD_MODULE_STUFF, + NULL, /* initializer */ +- create_db_auth_dir_config, /* dir config creater */ ++ create_auth_db_dir_config, /* dir config creater */ + NULL, /* dir merger --- default is to override */ + NULL, /* server config */ + NULL, /* merge server config */ +- db_auth_cmds, /* command table */ ++ auth_db_cmds, /* command table */ + NULL, /* handlers */ + NULL, /* filename translation */ +- db_authenticate_basic_user, /* check_user_id */ ++ authenticate_db_basic_user, /* check_user_id */ + db_check_auth, /* check auth */ + NULL, /* check access */ + NULL, /* type_checker */ +diff -urN apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c apache_1.3.14/src/modules/standard/mod_auth_dbm.c +--- apache_1.3.14.orig/src/modules/standard/mod_auth_dbm.c Thu Sep 21 15:19:33 2000 ++++ apache_1.3.14/src/modules/standard/mod_auth_dbm.c Sat Nov 11 22:56:37 2000 +@@ -92,7 +92,7 @@ + * instead. + * + * MODULE-DEFINITION-START +- * Name: dbm_auth_module ++ * Name: auth_dbm_module + * ConfigStart + . ./helpers/find-dbm-lib + * ConfigEnd +@@ -105,12 +105,12 @@ + char *auth_dbmgrpfile; + int auth_dbmauthoritative; + +-} dbm_auth_config_rec; ++} auth_dbm_config_rec; + +-static void *create_dbm_auth_dir_config(pool *p, char *d) ++static void *create_auth_dbm_dir_config(pool *p, char *d) + { +- dbm_auth_config_rec *sec +- = (dbm_auth_config_rec *) ap_pcalloc(p, sizeof(dbm_auth_config_rec)); ++ auth_dbm_config_rec *sec ++ = (auth_dbm_config_rec *) ap_pcalloc(p, sizeof(auth_dbm_config_rec)); + + sec->auth_dbmpwfile = NULL; + sec->auth_dbmgrpfile = NULL; +@@ -127,27 +127,27 @@ + return ap_set_file_slot(cmd, offset, f); + } + +-static const command_rec dbm_auth_cmds[] = ++static const command_rec auth_dbm_cmds[] = + { + {"AuthDBMUserFile", ap_set_file_slot, +- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile), ++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile), + OR_AUTHCFG, TAKE1, NULL}, + {"AuthDBMGroupFile", ap_set_file_slot, +- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile), ++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile), + OR_AUTHCFG, TAKE1, NULL}, + {"AuthUserFile", set_dbm_slot, +- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile), ++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmpwfile), + OR_AUTHCFG, TAKE12, NULL}, + {"AuthGroupFile", set_dbm_slot, +- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile), ++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmgrpfile), + OR_AUTHCFG, TAKE12, NULL}, + {"AuthDBMAuthoritative", ap_set_flag_slot, +- (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative), ++ (void *) XtOffsetOf(auth_dbm_config_rec, auth_dbmauthoritative), + 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"}, + {NULL} + }; + +-module MODULE_VAR_EXPORT dbm_auth_module; ++module MODULE_VAR_EXPORT auth_dbm_module; + + static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile) + { +@@ -210,11 +210,11 @@ + return grp_data; + } + +-static int dbm_authenticate_basic_user(request_rec *r) ++static int authenticate_dbm_basic_user(request_rec *r) + { +- dbm_auth_config_rec *sec = +- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config, +- &dbm_auth_module); ++ auth_dbm_config_rec *sec = ++ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config, ++ &auth_dbm_module); + conn_rec *c = r->connection; + const char *sent_pw; + char *real_pw, *colon_pw; +@@ -255,9 +255,9 @@ + + static int dbm_check_auth(request_rec *r) + { +- dbm_auth_config_rec *sec = +- (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config, +- &dbm_auth_module); ++ auth_dbm_config_rec *sec = ++ (auth_dbm_config_rec *) ap_get_module_config(r->per_dir_config, ++ &auth_dbm_module); + char *user = r->connection->user; + int m = r->method_number; + +@@ -316,18 +316,18 @@ + } + + +-module MODULE_VAR_EXPORT dbm_auth_module = ++module MODULE_VAR_EXPORT auth_dbm_module = + { + STANDARD_MODULE_STUFF, + NULL, /* initializer */ +- create_dbm_auth_dir_config, /* dir config creater */ ++ create_auth_dbm_dir_config, /* dir config creater */ + NULL, /* dir merger --- default is to override */ + NULL, /* server config */ + NULL, /* merge server config */ +- dbm_auth_cmds, /* command table */ ++ auth_dbm_cmds, /* command table */ + NULL, /* handlers */ + NULL, /* filename translation */ +- dbm_authenticate_basic_user, /* check_user_id */ ++ authenticate_dbm_basic_user, /* check_user_id */ + dbm_check_auth, /* check auth */ + NULL, /* check access */ + NULL, /* type_checker */ +diff -urN apache_1.3.14.orig/src/modules/standard/mod_include.c apache_1.3.14/src/modules/standard/mod_include.c +--- apache_1.3.14.orig/src/modules/standard/mod_include.c Fri Sep 22 20:26:32 2000 ++++ apache_1.3.14/src/modules/standard/mod_include.c Sat Nov 11 22:52:25 2000 +@@ -106,7 +106,7 @@ + #define RAW_ASCII_CHAR(ch) (ch) + #endif /*CHARSET_EBCDIC*/ + +-module MODULE_VAR_EXPORT includes_module; ++module MODULE_VAR_EXPORT include_module; + + /* ------------------------ Environment function -------------------------- */ + +@@ -733,7 +733,7 @@ + + /* see the Kludge in send_parsed_file for why */ + if (rr) +- ap_set_module_config(rr->request_config, &includes_module, r); ++ ap_set_module_config(rr->request_config, &include_module, r); + + if (!error_fmt && ap_run_sub_req(rr)) { + error_fmt = "unable to include \"%s\" in parsed file %s"; +@@ -2311,7 +2311,7 @@ + * option only changes the default. + */ + +-module includes_module; ++module include_module; + enum xbithack { + xbithack_off, xbithack_on, xbithack_full + }; +@@ -2322,7 +2322,7 @@ + #define DEFAULT_XBITHACK xbithack_off + #endif + +-static void *create_includes_dir_config(pool *p, char *dummy) ++static void *create_include_dir_config(pool *p, char *dummy) + { + enum xbithack *result = (enum xbithack *) ap_palloc(p, sizeof(enum xbithack)); + *result = DEFAULT_XBITHACK; +@@ -2353,7 +2353,7 @@ + { + FILE *f; + enum xbithack *state = +- (enum xbithack *) ap_get_module_config(r->per_dir_config, &includes_module); ++ (enum xbithack *) ap_get_module_config(r->per_dir_config, &include_module); + int errstatus; + request_rec *parent; + +@@ -2424,7 +2424,7 @@ + while (q) { + if (ap_table_get(q->notes, PARENT_STRING)) { + /* Kludge --- See below */ +- ap_set_module_config(r->request_config, &includes_module, q); ++ ap_set_module_config(r->request_config, &include_module, q); + + /* Create the initial environment in the parent */ + ap_add_common_vars(q); +@@ -2446,7 +2446,7 @@ + } + } + +- if ((parent = ap_get_module_config(r->request_config, &includes_module))) { ++ if ((parent = ap_get_module_config(r->request_config, &include_module))) { + /* Kludge --- for nested includes, we want to keep the subprocess + * environment of the base document (for compatibility); that means + * torquing our own last_modified date as well so that the +@@ -2516,7 +2516,7 @@ + } + + state = (enum xbithack *) ap_get_module_config(r->per_dir_config, +- &includes_module); ++ &include_module); + + if (*state == xbithack_off) { + return DECLINED; +@@ -2525,13 +2525,13 @@ + #endif + } + +-static const command_rec includes_cmds[] = ++static const command_rec include_cmds[] = + { + {"XBitHack", set_xbithack, NULL, OR_OPTIONS, TAKE1, "Off, On, or Full"}, + {NULL} + }; + +-static const handler_rec includes_handlers[] = ++static const handler_rec include_handlers[] = + { + {INCLUDES_MAGIC_TYPE, send_shtml_file}, + {INCLUDES_MAGIC_TYPE3, send_shtml_file}, +@@ -2540,16 +2540,16 @@ + {NULL} + }; + +-module MODULE_VAR_EXPORT includes_module = ++module MODULE_VAR_EXPORT include_module = + { + STANDARD_MODULE_STUFF, + NULL, /* initializer */ +- create_includes_dir_config, /* dir config creater */ ++ create_include_dir_config, /* dir config creater */ + NULL, /* dir merger --- default is to override */ + NULL, /* server config */ + NULL, /* merge server config */ +- includes_cmds, /* command table */ +- includes_handlers, /* handlers */ ++ include_cmds, /* command table */ ++ include_handlers, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ + NULL, /* check auth */ +diff -urN apache_1.3.14.orig/src/modules/standard/mod_log_agent.c apache_1.3.14/src/modules/standard/mod_log_agent.c +--- apache_1.3.14.orig/src/modules/standard/mod_log_agent.c Fri Jan 1 20:05:10 1999 ++++ apache_1.3.14/src/modules/standard/mod_log_agent.c Sat Nov 11 22:52:25 2000 +@@ -60,7 +60,7 @@ + #include "http_config.h" + #include "http_log.h" + +-module agent_log_module; ++module log_agent_module; + + static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT); + #ifdef OS2 +@@ -73,12 +73,12 @@ + typedef struct { + char *fname; + int agent_fd; +-} agent_log_state; ++} log_agent_state; + +-static void *make_agent_log_state(pool *p, server_rec *s) ++static void *make_log_agent_state(pool *p, server_rec *s) + { +- agent_log_state *cls = +- (agent_log_state *) ap_palloc(p, sizeof(agent_log_state)); ++ log_agent_state *cls = ++ (log_agent_state *) ap_palloc(p, sizeof(log_agent_state)); + + cls->fname = ""; cls->agent_fd = -1; @@ -86,26 +86,26 @@ return (void *) cls; @@ -458,9 +728,9 @@ diff -Nru apache_1.3.12/src/modules/standard/mod_log_agent.c apache_1.3.12.new/s NULL, /* header parser */ NULL, /* child_init */ NULL, /* child_exit */ -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 ---- apache_1.3.12/src/modules/standard/mod_log_config.c Mon Apr 3 00:26:44 2000 -+++ apache_1.3.12.new/src/modules/standard/mod_log_config.c Mon Apr 3 00:24:40 2000 +diff -urN apache_1.3.14.orig/src/modules/standard/mod_log_config.c apache_1.3.14/src/modules/standard/mod_log_config.c +--- apache_1.3.14.orig/src/modules/standard/mod_log_config.c Sat Nov 11 22:51:24 2000 ++++ apache_1.3.14/src/modules/standard/mod_log_config.c Sat Nov 11 22:52:25 2000 @@ -180,7 +180,7 @@ #include "http_log.h" #include @@ -469,7 +739,7 @@ diff -Nru apache_1.3.12/src/modules/standard/mod_log_config.c apache_1.3.12.new/ +module MODULE_VAR_EXPORT log_config_module; static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT); - #if defined(OS2) || defined(WIN32) + #if defined(OS2) || defined(WIN32) || defined(NETWARE) @@ -207,29 +207,29 @@ /* @@ -589,583 +859,313 @@ diff -Nru apache_1.3.12/src/modules/standard/mod_log_config.c apache_1.3.12.new/ + mls->log_configs = ap_make_array(p, 1, sizeof(log_config_state)); mls->default_format_string = NULL; mls->default_format = NULL; -- mls->server_config_logs = NULL; -+ mls->server_log_configs = NULL; - mls->formats = ap_make_table(p, 4); - ap_table_setn(mls->formats, "CLF", DEFAULT_LOG_FORMAT); - -@@ -958,12 +958,12 @@ - * vhosts inherit any globally-defined format names. - */ - --static void *merge_config_log_state(pool *p, void *basev, void *addv) -+static void *merge_log_config_state(pool *p, void *basev, void *addv) - { - multi_log_state *base = (multi_log_state *) basev; - multi_log_state *add = (multi_log_state *) addv; - -- add->server_config_logs = base->config_logs; -+ add->server_log_configs = base->log_configs; - if (!add->default_format) { - add->default_format_string = base->default_format_string; - add->default_format = base->default_format; -@@ -981,7 +981,7 @@ - { - const char *err_string = NULL; - multi_log_state *mls = ap_get_module_config(cmd->server->module_config, -- &config_log_module); -+ &log_config_module); - - /* - * If we were given two arguments, the second is a name to be given to the -@@ -1007,10 +1007,10 @@ - { - const char *err_string = NULL; - multi_log_state *mls = ap_get_module_config(cmd->server->module_config, -- &config_log_module); -- config_log_state *cls; -+ &log_config_module); -+ log_config_state *cls; - -- cls = (config_log_state *) ap_push_array(mls->config_logs); -+ cls = (log_config_state *) ap_push_array(mls->log_configs); - cls->condition_var = NULL; - if (envclause != NULL) { - if (strncasecmp(envclause, "env=", 4) != 0) { -@@ -1046,7 +1046,7 @@ - return add_custom_log(cmd, dummy, fn, "%{Cookie}n \"%r\" %t", NULL); - } - --static const command_rec config_log_cmds[] = -+static const command_rec log_config_cmds[] = - { - {"CustomLog", add_custom_log, NULL, RSRC_CONF, TAKE23, - "a file name, a custom log format string or format name, " -@@ -1060,8 +1060,8 @@ - {NULL} - }; - --static config_log_state *open_config_log(server_rec *s, pool *p, -- config_log_state *cls, -+static log_config_state *open_log_config(server_rec *s, pool *p, -+ log_config_state *cls, - array_header *default_format) - { - if (cls->log_fd > 0) { -@@ -1096,12 +1096,12 @@ - return cls; - } - --static config_log_state *open_multi_logs(server_rec *s, pool *p) -+static log_config_state *open_multi_logs(server_rec *s, pool *p) - { - int i; - multi_log_state *mls = ap_get_module_config(s->module_config, -- &config_log_module); -- config_log_state *clsarray; -+ &log_config_module); -+ log_config_state *clsarray; - const char *dummy; - const char *format; - -@@ -1116,10 +1116,10 @@ - mls->default_format = parse_log_string(p, DEFAULT_LOG_FORMAT, &dummy); - } - -- if (mls->config_logs->nelts) { -- clsarray = (config_log_state *) mls->config_logs->elts; -- for (i = 0; i < mls->config_logs->nelts; ++i) { -- config_log_state *cls = &clsarray[i]; -+ if (mls->log_configs->nelts) { -+ clsarray = (log_config_state *) mls->log_configs->elts; -+ for (i = 0; i < mls->log_configs->nelts; ++i) { -+ log_config_state *cls = &clsarray[i]; - - if (cls->format_string) { - format = ap_table_get(mls->formats, cls->format_string); -@@ -1128,13 +1128,13 @@ - } - } - -- cls = open_config_log(s, p, cls, mls->default_format); -+ cls = open_log_config(s, p, cls, mls->default_format); - } - } -- else if (mls->server_config_logs) { -- clsarray = (config_log_state *) mls->server_config_logs->elts; -- for (i = 0; i < mls->server_config_logs->nelts; ++i) { -- config_log_state *cls = &clsarray[i]; -+ else if (mls->server_log_configs) { -+ clsarray = (log_config_state *) mls->server_log_configs->elts; -+ for (i = 0; i < mls->server_log_configs->nelts; ++i) { -+ log_config_state *cls = &clsarray[i]; - - if (cls->format_string) { - format = ap_table_get(mls->formats, cls->format_string); -@@ -1143,14 +1143,14 @@ - } - } - -- cls = open_config_log(s, p, cls, mls->default_format); -+ cls = open_log_config(s, p, cls, mls->default_format); - } - } - - return NULL; - } - --static void init_config_log(server_rec *s, pool *p) -+static void init_log_config(server_rec *s, pool *p) - { - /* First, do "physical" server, which gets default log fd and format - * for the virtual servers, if they don't override... -@@ -1170,20 +1170,20 @@ - { - multi_log_state *mls; - array_header *log_list; -- config_log_state *clsarray; -+ log_config_state *clsarray; - int i; - - for (; s; s = s->next) { -- mls = ap_get_module_config(s->module_config, &config_log_module); -+ mls = ap_get_module_config(s->module_config, &log_config_module); - log_list = NULL; -- if (mls->config_logs->nelts) { -- log_list = mls->config_logs; -+ if (mls->log_configs->nelts) { -+ log_list = mls->log_configs; - } -- else if (mls->server_config_logs) { -- log_list = mls->server_config_logs; -+ else if (mls->server_log_configs) { -+ log_list = mls->server_log_configs; - } - if (log_list) { -- clsarray = (config_log_state *) log_list->elts; -+ clsarray = (log_config_state *) log_list->elts; - for (i = 0; i < log_list->nelts; ++i) { - flush_log(&clsarray[i]); - } -@@ -1192,15 +1192,15 @@ - } - #endif - --module MODULE_VAR_EXPORT config_log_module = -+module MODULE_VAR_EXPORT log_config_module = - { - STANDARD_MODULE_STUFF, -- init_config_log, /* initializer */ -+ init_log_config, /* initializer */ - NULL, /* create per-dir config */ - NULL, /* merge per-dir config */ -- make_config_log_state, /* server config */ -- merge_config_log_state, /* merge server config */ -- config_log_cmds, /* command table */ -+ make_log_config_state, /* server config */ -+ merge_log_config_state, /* merge server config */ -+ log_config_cmds, /* command table */ - NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ -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 ---- apache_1.3.12/src/modules/standard/mod_log_referer.c Fri Jan 1 20:05:11 1999 -+++ apache_1.3.12.new/src/modules/standard/mod_log_referer.c Mon Apr 3 00:44:02 2000 -@@ -60,7 +60,7 @@ - #include "http_config.h" - #include "http_log.h" - --module referer_log_module; -+module log_referer_module; - - static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT); - -@@ -75,12 +75,12 @@ - char *fname; - int referer_fd; - array_header *referer_ignore_list; --} referer_log_state; -+} log_referer_state; - --static void *make_referer_log_state(pool *p, server_rec *s) -+static void *make_log_referer_state(pool *p, server_rec *s) - { -- referer_log_state *cls = -- (referer_log_state *) ap_palloc(p, sizeof(referer_log_state)); -+ log_referer_state *cls = -+ (log_referer_state *) ap_palloc(p, sizeof(log_referer_state)); - - cls->fname = ""; - cls->referer_fd = -1; -@@ -88,10 +88,10 @@ - return (void *) cls; - } - --static const char *set_referer_log(cmd_parms *parms, void *dummy, char *arg) -+static const char *set_log_referer(cmd_parms *parms, void *dummy, char *arg) - { -- referer_log_state *cls = ap_get_module_config(parms->server->module_config, -- &referer_log_module); -+ log_referer_state *cls = ap_get_module_config(parms->server->module_config, -+ &log_referer_module); - - cls->fname = arg; - return NULL; -@@ -100,8 +100,8 @@ - static const char *add_referer_ignore(cmd_parms *parms, void *dummy, char *arg) - { - char **addme; -- referer_log_state *cls = ap_get_module_config(parms->server->module_config, -- &referer_log_module); -+ log_referer_state *cls = ap_get_module_config(parms->server->module_config, -+ &log_referer_module); - - addme = ap_push_array(cls->referer_ignore_list); - ap_str_tolower(arg); -@@ -109,19 +109,19 @@ - return NULL; - } - --static const command_rec referer_log_cmds[] = -+static const command_rec log_referer_cmds[] = - { -- {"RefererLog", set_referer_log, NULL, RSRC_CONF, TAKE1, -+ {"RefererLog", set_log_referer, NULL, RSRC_CONF, TAKE1, - "the filename of the referer log"}, - {"RefererIgnore", add_referer_ignore, NULL, RSRC_CONF, ITERATE, - "referer hostnames to ignore"}, - {NULL} - }; - --static void open_referer_log(server_rec *s, pool *p) -+static void open_log_referer(server_rec *s, pool *p) - { -- referer_log_state *cls = ap_get_module_config(s->module_config, -- &referer_log_module); -+ log_referer_state *cls = ap_get_module_config(s->module_config, -+ &log_referer_module); +- mls->server_config_logs = NULL; ++ mls->server_log_configs = NULL; + mls->formats = ap_make_table(p, 4); + ap_table_setn(mls->formats, "CLF", DEFAULT_LOG_FORMAT); - char *fname = ap_server_root_relative(p, cls->fname); +@@ -958,12 +958,12 @@ + * vhosts inherit any globally-defined format names. + */ -@@ -149,17 +149,17 @@ - } - } +-static void *merge_config_log_state(pool *p, void *basev, void *addv) ++static void *merge_log_config_state(pool *p, void *basev, void *addv) + { + multi_log_state *base = (multi_log_state *) basev; + multi_log_state *add = (multi_log_state *) addv; --static void init_referer_log(server_rec *s, pool *p) -+static void init_log_referer(server_rec *s, pool *p) +- add->server_config_logs = base->config_logs; ++ add->server_log_configs = base->log_configs; + if (!add->default_format) { + add->default_format_string = base->default_format_string; + add->default_format = base->default_format; +@@ -981,7 +981,7 @@ { - for (; s; s = s->next) -- open_referer_log(s, p); -+ open_log_referer(s, p); - } + const char *err_string = NULL; + multi_log_state *mls = ap_get_module_config(cmd->server->module_config, +- &config_log_module); ++ &log_config_module); --static int referer_log_transaction(request_rec *orig) -+static int log_referer_transaction(request_rec *orig) + /* + * If we were given two arguments, the second is a name to be given to the +@@ -1007,10 +1007,10 @@ { - char **ptrptr, **ptrptr2; -- referer_log_state *cls = ap_get_module_config(orig->server->module_config, -- &referer_log_module); -+ log_referer_state *cls = ap_get_module_config(orig->server->module_config, -+ &log_referer_module); + const char *err_string = NULL; + multi_log_state *mls = ap_get_module_config(cmd->server->module_config, +- &config_log_module); +- config_log_state *cls; ++ &log_config_module); ++ log_config_state *cls; - char *str; - const char *referer; -@@ -205,15 +205,15 @@ - return OK; +- cls = (config_log_state *) ap_push_array(mls->config_logs); ++ cls = (log_config_state *) ap_push_array(mls->log_configs); + cls->condition_var = NULL; + if (envclause != NULL) { + if (strncasecmp(envclause, "env=", 4) != 0) { +@@ -1046,7 +1046,7 @@ + return add_custom_log(cmd, dummy, fn, "%{Cookie}n \"%r\" %t", NULL); } --module referer_log_module = -+module log_referer_module = +-static const command_rec config_log_cmds[] = ++static const command_rec log_config_cmds[] = { - STANDARD_MODULE_STUFF, -- init_referer_log, /* initializer */ -+ init_log_referer, /* initializer */ - NULL, /* create per-dir config */ - NULL, /* merge per-dir config */ -- make_referer_log_state, /* server config */ -+ make_log_referer_state, /* server config */ - NULL, /* merge server config */ -- referer_log_cmds, /* command table */ -+ log_referer_cmds, /* command table */ - NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ -@@ -221,7 +221,7 @@ - NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* fixups */ -- referer_log_transaction, /* logger */ -+ log_referer_transaction, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ -diff -Nru apache_1.3.12/src/modules/standard/mod_actions.c apache_1.3.12.new/src/modules/standard/mod_actions.c ---- apache_1.3.12/src/modules/standard/mod_actions.c Wed Feb 2 21:44:00 2000 -+++ apache_1.3.12.new/src/modules/standard/mod_actions.c Mon Apr 3 00:47:35 2000 -@@ -96,34 +96,34 @@ - * track extension method mappings -- table keys are case-INsensitive. - */ - typedef struct { -- table *action_types; /* Added with Action... */ -+ table *actions_types; /* Added with Action... */ - char *scripted[METHODS]; /* Added with Script... */ - array_header *xmethods; /* Added with Script -- extension methods */ --} action_dir_config; -+} actions_dir_config; - --module action_module; -+module actions_module; + {"CustomLog", add_custom_log, NULL, RSRC_CONF, TAKE23, + "a file name, a custom log format string or format name, " +@@ -1060,8 +1060,8 @@ + {NULL} + }; --static void *create_action_dir_config(pool *p, char *dummy) -+static void *create_actions_dir_config(pool *p, char *dummy) +-static config_log_state *open_config_log(server_rec *s, pool *p, +- config_log_state *cls, ++static log_config_state *open_log_config(server_rec *s, pool *p, ++ log_config_state *cls, + array_header *default_format) { -- action_dir_config *new = -- (action_dir_config *) ap_palloc(p, sizeof(action_dir_config)); -+ actions_dir_config *new = -+ (actions_dir_config *) ap_palloc(p, sizeof(actions_dir_config)); - -- new->action_types = ap_make_table(p, 4); -+ new->actions_types = ap_make_table(p, 4); - memset(new->scripted, 0, sizeof(new->scripted)); - new->xmethods = ap_make_array(p, 4, sizeof(xmethod_t)); - return new; + if (cls->log_fd > 0) { +@@ -1096,12 +1096,12 @@ + return cls; } --static void *merge_action_dir_configs(pool *p, void *basev, void *addv) -+static void *merge_actions_dir_configs(pool *p, void *basev, void *addv) +-static config_log_state *open_multi_logs(server_rec *s, pool *p) ++static log_config_state *open_multi_logs(server_rec *s, pool *p) { -- action_dir_config *base = (action_dir_config *) basev; -- action_dir_config *add = (action_dir_config *) addv; -- action_dir_config *new = (action_dir_config *) ap_palloc(p, -- sizeof(action_dir_config)); -+ actions_dir_config *base = (actions_dir_config *) basev; -+ actions_dir_config *add = (actions_dir_config *) addv; -+ actions_dir_config *new = (actions_dir_config *) ap_palloc(p, -+ sizeof(actions_dir_config)); int i; + multi_log_state *mls = ap_get_module_config(s->module_config, +- &config_log_module); +- config_log_state *clsarray; ++ &log_config_module); ++ log_config_state *clsarray; + const char *dummy; + const char *format; -- new->action_types = ap_overlay_tables(p, add->action_types, -- base->action_types); -+ new->actions_types = ap_overlay_tables(p, add->actions_types, -+ base->actions_types); +@@ -1116,10 +1116,10 @@ + mls->default_format = parse_log_string(p, DEFAULT_LOG_FORMAT, &dummy); + } - for (i = 0; i < METHODS; ++i) { - new->scripted[i] = add->scripted[i] ? add->scripted[i] -@@ -133,14 +133,14 @@ - return new; - } +- if (mls->config_logs->nelts) { +- clsarray = (config_log_state *) mls->config_logs->elts; +- for (i = 0; i < mls->config_logs->nelts; ++i) { +- config_log_state *cls = &clsarray[i]; ++ if (mls->log_configs->nelts) { ++ clsarray = (log_config_state *) mls->log_configs->elts; ++ for (i = 0; i < mls->log_configs->nelts; ++i) { ++ log_config_state *cls = &clsarray[i]; --static const char *add_action(cmd_parms *cmd, action_dir_config *m, char *type, -+static const char *add_actions(cmd_parms *cmd, actions_dir_config *m, char *type, - char *script) - { -- ap_table_setn(m->action_types, type, script); -+ ap_table_setn(m->actions_types, type, script); - return NULL; - } + if (cls->format_string) { + format = ap_table_get(mls->formats, cls->format_string); +@@ -1128,13 +1128,13 @@ + } + } + +- cls = open_config_log(s, p, cls, mls->default_format); ++ cls = open_log_config(s, p, cls, mls->default_format); + } + } +- else if (mls->server_config_logs) { +- clsarray = (config_log_state *) mls->server_config_logs->elts; +- for (i = 0; i < mls->server_config_logs->nelts; ++i) { +- config_log_state *cls = &clsarray[i]; ++ else if (mls->server_log_configs) { ++ clsarray = (log_config_state *) mls->server_log_configs->elts; ++ for (i = 0; i < mls->server_log_configs->nelts; ++i) { ++ log_config_state *cls = &clsarray[i]; + + if (cls->format_string) { + format = ap_table_get(mls->formats, cls->format_string); +@@ -1143,14 +1143,14 @@ + } + } + +- cls = open_config_log(s, p, cls, mls->default_format); ++ cls = open_log_config(s, p, cls, mls->default_format); + } + } --static const char *set_script(cmd_parms *cmd, action_dir_config *m, -+static const char *set_script(cmd_parms *cmd, actions_dir_config *m, - char *method, char *script) - { - int methnum; -@@ -182,20 +182,20 @@ return NULL; } --static const command_rec action_cmds[] = -+static const command_rec actions_cmds[] = +-static void init_config_log(server_rec *s, pool *p) ++static void init_log_config(server_rec *s, pool *p) { -- {"Action", add_action, NULL, OR_FILEINFO, TAKE2, -+ {"Action", add_actions, NULL, OR_FILEINFO, TAKE2, - "a media type followed by a script name"}, - {"Script", set_script, NULL, ACCESS_CONF | RSRC_CONF, TAKE2, - "a method followed by a script name"}, - {NULL} - }; - --static int action_handler(request_rec *r) -+static int actions_handler(request_rec *r) + /* First, do "physical" server, which gets default log fd and format + * for the virtual servers, if they don't override... +@@ -1170,20 +1170,20 @@ { -- action_dir_config *conf = (action_dir_config *) -- ap_get_module_config(r->per_dir_config, &action_module); -- const char *t, *action = r->handler ? r->handler : -+ actions_dir_config *conf = (actions_dir_config *) -+ ap_get_module_config(r->per_dir_config, &actions_module); -+ const char *t, *actions = r->handler ? r->handler : - ap_field_noparam(r->pool, r->content_type); - const char *script; + multi_log_state *mls; + array_header *log_list; +- config_log_state *clsarray; ++ log_config_state *clsarray; int i; -@@ -242,9 +242,9 @@ - return DECLINED; - } - -- /* Second, check for actions (which override the method scripts) */ -- if ((t = ap_table_get(conf->action_types, -- action ? action : ap_default_type(r)))) { -+ /* Second, check for actionss (which override the method scripts) */ -+ if ((t = ap_table_get(conf->actions_types, -+ actions ? actions : ap_default_type(r)))) { - script = t; - } -@@ -260,22 +260,22 @@ - return OK; + for (; s; s = s->next) { +- mls = ap_get_module_config(s->module_config, &config_log_module); ++ mls = ap_get_module_config(s->module_config, &log_config_module); + log_list = NULL; +- if (mls->config_logs->nelts) { +- log_list = mls->config_logs; ++ if (mls->log_configs->nelts) { ++ log_list = mls->log_configs; + } +- else if (mls->server_config_logs) { +- log_list = mls->server_config_logs; ++ else if (mls->server_log_configs) { ++ log_list = mls->server_log_configs; + } + if (log_list) { +- clsarray = (config_log_state *) log_list->elts; ++ clsarray = (log_config_state *) log_list->elts; + for (i = 0; i < log_list->nelts; ++i) { + flush_log(&clsarray[i]); + } +@@ -1192,15 +1192,15 @@ } + #endif --static const handler_rec action_handlers[] = -+static const handler_rec actions_handlers[] = - { -- {"*/*", action_handler}, -+ {"*/*", actions_handler}, - {NULL} - }; - --module action_module = -+module actions_module = +-module MODULE_VAR_EXPORT config_log_module = ++module MODULE_VAR_EXPORT log_config_module = { STANDARD_MODULE_STUFF, - NULL, /* initializer */ -- create_action_dir_config, /* dir config creater */ -- merge_action_dir_configs, /* dir merger --- default is to override */ -+ create_actions_dir_config, /* dir config creater */ -+ merge_actions_dir_configs, /* dir merger --- default is to override */ - NULL, /* server config */ - NULL, /* merge server config */ -- action_cmds, /* command table */ -- action_handlers, /* handlers */ -+ actions_cmds, /* command table */ -+ actions_handlers, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ -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 ---- apache_1.3.12/src/modules/standard/mod_auth_anon.c Thu Oct 21 22:45:15 1999 -+++ apache_1.3.12.new/src/modules/standard/mod_auth_anon.c Mon Apr 3 00:50:56 2000 -@@ -114,12 +114,12 @@ - int auth_anon_mustemail; - int auth_anon_authoritative; +- init_config_log, /* initializer */ ++ init_log_config, /* initializer */ + NULL, /* create per-dir config */ + NULL, /* merge per-dir config */ +- make_config_log_state, /* server config */ +- merge_config_log_state, /* merge server config */ +- config_log_cmds, /* command table */ ++ make_log_config_state, /* server config */ ++ merge_log_config_state, /* merge server config */ ++ log_config_cmds, /* command table */ + NULL, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ +diff -urN apache_1.3.14.orig/src/modules/standard/mod_log_referer.c apache_1.3.14/src/modules/standard/mod_log_referer.c +--- apache_1.3.14.orig/src/modules/standard/mod_log_referer.c Fri Jan 1 20:05:11 1999 ++++ apache_1.3.14/src/modules/standard/mod_log_referer.c Sat Nov 11 22:52:25 2000 +@@ -60,7 +60,7 @@ + #include "http_config.h" + #include "http_log.h" --} anon_auth_config_rec; -+} auth_anon_config_rec; +-module referer_log_module; ++module log_referer_module; --static void *create_anon_auth_dir_config(pool *p, char *d) -+static void *create_auth_anon_dir_config(pool *p, char *d) - { -- anon_auth_config_rec *sec = (anon_auth_config_rec *) -- ap_pcalloc(p, sizeof(anon_auth_config_rec)); -+ auth_anon_config_rec *sec = (auth_anon_config_rec *) -+ ap_pcalloc(p, sizeof(auth_anon_config_rec)); + static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT); - if (!sec) - return NULL; /* no memory... */ -@@ -136,39 +136,39 @@ - } +@@ -75,12 +75,12 @@ + char *fname; + int referer_fd; + array_header *referer_ignore_list; +-} referer_log_state; ++} log_referer_state; - static const char *anon_set_passwd_flag(cmd_parms *cmd, -- anon_auth_config_rec * sec, int arg) -+ auth_anon_config_rec * sec, int arg) +-static void *make_referer_log_state(pool *p, server_rec *s) ++static void *make_log_referer_state(pool *p, server_rec *s) { - sec->auth_anon_mustemail = arg; - return NULL; - } +- referer_log_state *cls = +- (referer_log_state *) ap_palloc(p, sizeof(referer_log_state)); ++ log_referer_state *cls = ++ (log_referer_state *) ap_palloc(p, sizeof(log_referer_state)); - static const char *anon_set_userid_flag(cmd_parms *cmd, -- anon_auth_config_rec * sec, int arg) -+ auth_anon_config_rec * sec, int arg) - { - sec->auth_anon_nouserid = arg; - return NULL; - } - static const char *anon_set_logemail_flag(cmd_parms *cmd, -- anon_auth_config_rec * sec, int arg) -+ auth_anon_config_rec * sec, int arg) - { - sec->auth_anon_logemail = arg; - return NULL; - } - static const char *anon_set_verifyemail_flag(cmd_parms *cmd, -- anon_auth_config_rec * sec, int arg) -+ auth_anon_config_rec * sec, int arg) - { - sec->auth_anon_verifyemail = arg; - return NULL; + cls->fname = ""; + cls->referer_fd = -1; +@@ -88,10 +88,10 @@ + return (void *) cls; } - static const char *anon_set_authoritative_flag(cmd_parms *cmd, -- anon_auth_config_rec * sec, int arg) -+ auth_anon_config_rec * sec, int arg) + +-static const char *set_referer_log(cmd_parms *parms, void *dummy, char *arg) ++static const char *set_log_referer(cmd_parms *parms, void *dummy, char *arg) { - sec->auth_anon_authoritative = arg; - return NULL; - } +- referer_log_state *cls = ap_get_module_config(parms->server->module_config, +- &referer_log_module); ++ log_referer_state *cls = ap_get_module_config(parms->server->module_config, ++ &log_referer_module); - static const char *anon_set_string_slots(cmd_parms *cmd, -- anon_auth_config_rec * sec, char *arg) -+ auth_anon_config_rec * sec, char *arg) + cls->fname = arg; + return NULL; +@@ -100,8 +100,8 @@ + static const char *add_referer_ignore(cmd_parms *parms, void *dummy, char *arg) { + char **addme; +- referer_log_state *cls = ap_get_module_config(parms->server->module_config, +- &referer_log_module); ++ log_referer_state *cls = ap_get_module_config(parms->server->module_config, ++ &log_referer_module); - auth_anon *first; -@@ -191,7 +191,7 @@ + addme = ap_push_array(cls->referer_ignore_list); + ap_str_tolower(arg); +@@ -109,19 +109,19 @@ return NULL; } --static const command_rec anon_auth_cmds[] = -+static const command_rec auth_anon_cmds[] = +-static const command_rec referer_log_cmds[] = ++static const command_rec log_referer_cmds[] = { - {"Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG, ITERATE, - "a space-separated list of user IDs"}, -@@ -209,13 +209,13 @@ +- {"RefererLog", set_referer_log, NULL, RSRC_CONF, TAKE1, ++ {"RefererLog", set_log_referer, NULL, RSRC_CONF, TAKE1, + "the filename of the referer log"}, + {"RefererIgnore", add_referer_ignore, NULL, RSRC_CONF, ITERATE, + "referer hostnames to ignore"}, {NULL} }; --module MODULE_VAR_EXPORT anon_auth_module; -+module MODULE_VAR_EXPORT auth_anon_module; +-static void open_referer_log(server_rec *s, pool *p) ++static void open_log_referer(server_rec *s, pool *p) + { +- referer_log_state *cls = ap_get_module_config(s->module_config, +- &referer_log_module); ++ log_referer_state *cls = ap_get_module_config(s->module_config, ++ &log_referer_module); --static int anon_authenticate_basic_user(request_rec *r) -+static int authenticate_anon_basic_user(request_rec *r) + char *fname = ap_server_root_relative(p, cls->fname); + +@@ -149,17 +149,17 @@ + } + } + +-static void init_referer_log(server_rec *s, pool *p) ++static void init_log_referer(server_rec *s, pool *p) { -- anon_auth_config_rec *sec = -- (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config, -- &anon_auth_module); -+ auth_anon_config_rec *sec = -+ (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config, -+ &auth_anon_module); - conn_rec *c = r->connection; - const char *sent_pw; - int res = DECLINED; -@@ -275,9 +275,9 @@ + for (; s; s = s->next) +- open_referer_log(s, p); ++ open_log_referer(s, p); + } + +-static int referer_log_transaction(request_rec *orig) ++static int log_referer_transaction(request_rec *orig) { - #ifdef NOTYET - conn_rec *c = r->connection; -- anon_auth_config_rec *sec = -- (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config, -- &anon_auth_module); -+ auth_anon_config_rec *sec = -+ (auth_anon_config_rec *) ap_get_module_config(r->per_dir_config, -+ &auth_anon_module); + char **ptrptr, **ptrptr2; +- referer_log_state *cls = ap_get_module_config(orig->server->module_config, +- &referer_log_module); ++ log_referer_state *cls = ap_get_module_config(orig->server->module_config, ++ &log_referer_module); - if (!sec->auth_anon) - return DECLINED; -@@ -291,18 +291,18 @@ + char *str; + const char *referer; +@@ -205,15 +205,15 @@ + return OK; } - --module MODULE_VAR_EXPORT anon_auth_module = -+module MODULE_VAR_EXPORT auth_anon_module = +-module referer_log_module = ++module log_referer_module = { STANDARD_MODULE_STUFF, - NULL, /* initializer */ -- create_anon_auth_dir_config, /* dir config creater */ -+ create_auth_anon_dir_config, /* dir config creater */ - NULL, /* dir merger ensure strictness */ - NULL, /* server config */ - NULL, /* merge server config */ -- anon_auth_cmds, /* command table */ -+ auth_anon_cmds, /* command table */ - NULL, /* handlers */ - NULL, /* filename translation */ -- anon_authenticate_basic_user, /* check_user_id */ -+ authenticate_anon_basic_user, /* check_user_id */ - check_anon_access, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ +- init_referer_log, /* initializer */ ++ init_log_referer, /* initializer */ + NULL, /* create per-dir config */ + NULL, /* merge per-dir config */ +- make_referer_log_state, /* server config */ ++ make_log_referer_state, /* server config */ + NULL, /* merge server config */ +- referer_log_cmds, /* command table */ ++ log_referer_cmds, /* command table */ + NULL, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ +@@ -221,7 +221,7 @@ + NULL, /* check access */ + NULL, /* type_checker */ + NULL, /* fixups */ +- referer_log_transaction, /* logger */ ++ log_referer_transaction, /* logger */ + NULL, /* header parser */ + NULL, /* child_init */ + NULL, /* child_exit */