-diff -Nru apache_1.3.12/htdocs/manual/mod/directives.html apache_1.3.12.new/htdocs/manual/mod/directives.html
---- apache_1.3.12/htdocs/manual/mod/directives.html Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/htdocs/manual/mod/directives.html Mon Mar 13 19:29:56 2000
+diff -urN apache_1.3.14.orig/htdocs/manual/mod/directives.html apache_1.3.14/htdocs/manual/mod/directives.html
+--- apache_1.3.14.orig/htdocs/manual/mod/directives.html Tue Oct 10 22:23:46 2000
++++ apache_1.3.14/htdocs/manual/mod/directives.html Sat Nov 11 20:59:29 2000
@@ -99,6 +99,7 @@
<LI><A HREF="mod_autoindex.html#defaulticon">DefaultIcon</A>
<LI><A HREF="mod_mime.html#defaultlanguage">DefaultLanguage</A>
<LI><A HREF="core.html#defaulttype">DefaultType</A>
+<LI><A HREF="mod_define.html#define">Define</A>
- <LI><A HREF="mod_access.html#deny">deny</A>
+ <LI><A HREF="mod_access.html#deny">Deny</A>
<LI><A HREF="core.html#directory"><Directory></A>
<LI><A HREF="core.html#directorymatch"><DirectoryMatch></A>
-diff -Nru apache_1.3.12/htdocs/manual/mod/index.html apache_1.3.12.new/htdocs/manual/mod/index.html
---- apache_1.3.12/htdocs/manual/mod/index.html Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/htdocs/manual/mod/index.html Mon Mar 13 19:29:55 2000
-@@ -62,6 +62,8 @@
+diff -urN apache_1.3.14.orig/htdocs/manual/mod/index.html apache_1.3.14/htdocs/manual/mod/index.html
+--- apache_1.3.14.orig/htdocs/manual/mod/index.html Tue Oct 10 22:23:46 2000
++++ apache_1.3.14/htdocs/manual/mod/index.html Sat Nov 11 20:58:35 2000
+@@ -65,6 +65,8 @@
<DT><A HREF="mod_cookies.html">mod_cookies</A> up to Apache 1.1.1
<DD>Support for Netscape-like cookies. Replaced in Apache 1.2 by
mod_usertrack
+<DT><A HREF="mod_define.html">mod_define</A>
+<DD>Variable Definition for Arbitrary Directives
- <DT><A HREF="mod_digest.html">mod_digest</A>
+ <DT><A HREF="mod_digest.html">mod_digest</A> Apache 1.1 and up
<DD>MD5 authentication
<DT><A HREF="mod_dir.html">mod_dir</A>
-diff -Nru apache_1.3.12/htdocs/manual/mod/mod_define.html apache_1.3.12.new/htdocs/manual/mod/mod_define.html
---- apache_1.3.12/htdocs/manual/mod/mod_define.html Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/htdocs/manual/mod/mod_define.html Fri Aug 27 11:23:39 1999
+diff -urN apache_1.3.14.orig/htdocs/manual/mod/mod_define.html apache_1.3.14/htdocs/manual/mod/mod_define.html
+--- apache_1.3.14.orig/htdocs/manual/mod/mod_define.html Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/htdocs/manual/mod/mod_define.html Sat Nov 11 20:49:14 2000
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!--%hypertext -->
+</BODY>
+</HTML>
+<!--/%hypertext -->
-diff -Nru apache_1.3.12/src/ApacheCore.def apache_1.3.12.new/src/ApacheCore.def
---- apache_1.3.12/src/ApacheCore.def Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/ApacheCore.def Mon Mar 13 19:30:30 2000
-@@ -360,3 +360,17 @@
- ap_SHA1Final @355
- ap_sha1_base64 @356
- ap_send_error_response @357
-+ ap_add_config_define @358
-+ ap_global_ctx @359
-+ ap_ctx_new @360
-+ ap_ctx_get @361
-+ ap_ctx_set @362
-+ ap_hook_init @363
-+ ap_hook_kill @364
-+ ap_hook_configure @365
-+ ap_hook_register_I @366
-+ ap_hook_unregister_I @367
-+ ap_hook_status @368
-+ ap_hook_use @369
-+ ap_hook_call @370
-+
-diff -Nru apache_1.3.12/src/Configuration.tmpl apache_1.3.12.new/src/Configuration.tmpl
---- apache_1.3.12/src/Configuration.tmpl Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/Configuration.tmpl Mon Mar 13 19:39:11 2000
+diff -urN apache_1.3.14.orig/src/ApacheCore.def apache_1.3.14/src/ApacheCore.def
+--- apache_1.3.14.orig/src/ApacheCore.def Sun Oct 8 07:23:15 2000
++++ apache_1.3.14/src/ApacheCore.def Sat Nov 11 20:56:47 2000
+@@ -389,3 +389,18 @@
+ ap_stripprefix @380
+ ap_os_dso_load @381
+ ap_os_dso_error @382
++
++ ; EAPI patch
++ ap_add_config_define @383
++ ap_global_ctx @384
++ ap_ctx_new @385
++ ap_ctx_get @386
++ ap_ctx_set @387
++ ap_hook_init @388
++ ap_hook_kill @389
++ ap_hook_configure @390
++ ap_hook_register_I @391
++ ap_hook_unregister_I @392
++ ap_hook_status @393
++ ap_hook_use @394
++ ap_hook_call @395
+diff -urN apache_1.3.14.orig/src/Configuration.tmpl apache_1.3.14/src/Configuration.tmpl
+--- apache_1.3.14.orig/src/Configuration.tmpl Sat Aug 14 10:35:43 1999
++++ apache_1.3.14/src/Configuration.tmpl Sat Nov 11 20:49:14 2000
@@ -68,6 +68,24 @@
#TARGET=
##
## Request logging modules
-diff -Nru apache_1.3.12/src/Configure apache_1.3.12.new/src/Configure
---- apache_1.3.12/src/Configure Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/Configure Mon Mar 13 19:30:30 2000
-@@ -1727,6 +1727,72 @@
+diff -urN apache_1.3.14.orig/src/Configure apache_1.3.14/src/Configure
+--- apache_1.3.14.orig/src/Configure Tue Oct 10 17:30:03 2000
++++ apache_1.3.14/src/Configure Sat Nov 11 20:49:14 2000
+@@ -1778,6 +1778,72 @@
fi
####################################################################
## Add in the Expat library if needed/wanted.
##
if [ -d ./lib/expat-lite/ ]; then
-diff -Nru apache_1.3.12/src/ap/Makefile.tmpl apache_1.3.12.new/src/ap/Makefile.tmpl
---- apache_1.3.12/src/ap/Makefile.tmpl Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/ap/Makefile.tmpl Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/ap/Makefile.tmpl apache_1.3.14/src/ap/Makefile.tmpl
+--- apache_1.3.14.orig/src/ap/Makefile.tmpl Fri Jun 23 01:22:21 2000
++++ apache_1.3.14/src/ap/Makefile.tmpl Sat Nov 11 20:49:14 2000
@@ -6,7 +6,8 @@
LIB=libap.a
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
-diff -Nru apache_1.3.12/src/ap/ap.mak apache_1.3.12.new/src/ap/ap.mak
---- apache_1.3.12/src/ap/ap.mak Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/ap/ap.mak Mon Mar 13 19:30:30 2000
-@@ -47,6 +47,9 @@
- -@erase "$(INTDIR)\ap_cpystrn.obj"
+diff -urN apache_1.3.14.orig/src/ap/ap.mak apache_1.3.14/src/ap/ap.mak
+--- apache_1.3.14.orig/src/ap/ap.mak Thu Sep 21 15:57:14 2000
++++ apache_1.3.14/src/ap/ap.mak Sat Nov 11 20:50:57 2000
+@@ -50,6 +50,9 @@
-@erase "$(INTDIR)\ap_fnmatch.obj"
-@erase "$(INTDIR)\ap_md5c.obj"
+ -@erase "$(INTDIR)\ap_sha1.obj"
+ -@erase "$(INTDIR)\ap_hook.obj"
+ -@erase "$(INTDIR)\ap_ctx.obj"
+ -@erase "$(INTDIR)\ap_mm.obj"
-@erase "$(INTDIR)\ap_signal.obj"
-@erase "$(INTDIR)\ap_slack.obj"
-@erase "$(INTDIR)\ap_snprintf.obj"
-@@ -105,6 +108,9 @@
- "$(INTDIR)\ap_cpystrn.obj" \
+@@ -109,6 +112,9 @@
"$(INTDIR)\ap_fnmatch.obj" \
"$(INTDIR)\ap_md5c.obj" \
+ "$(INTDIR)\ap_sha1.obj" \
+ "$(INTDIR)\ap_hook.obj" \
+ "$(INTDIR)\ap_ctx.obj" \
+ "$(INTDIR)\ap_mm.obj" \
"$(INTDIR)\ap_signal.obj" \
"$(INTDIR)\ap_slack.obj" \
- "$(INTDIR)\ap_snprintf.obj" \
-@@ -139,6 +145,9 @@
- -@erase "$(INTDIR)\ap_cpystrn.obj"
+ "$(INTDIR)\ap_snprintf.obj"
+@@ -143,6 +149,9 @@
-@erase "$(INTDIR)\ap_fnmatch.obj"
-@erase "$(INTDIR)\ap_md5c.obj"
+ -@erase "$(INTDIR)\ap_sha1.obj"
+ -@erase "$(INTDIR)\ap_hook.obj"
+ -@erase "$(INTDIR)\ap_ctx.obj"
+ -@erase "$(INTDIR)\ap_mm.obj"
-@erase "$(INTDIR)\ap_signal.obj"
-@erase "$(INTDIR)\ap_slack.obj"
-@erase "$(INTDIR)\ap_snprintf.obj"
-@@ -197,6 +206,9 @@
- "$(INTDIR)\ap_cpystrn.obj" \
+@@ -202,6 +211,9 @@
"$(INTDIR)\ap_fnmatch.obj" \
"$(INTDIR)\ap_md5c.obj" \
+ "$(INTDIR)\ap_sha1.obj" \
+ "$(INTDIR)\ap_hook.obj" \
+ "$(INTDIR)\ap_ctx.obj" \
+ "$(INTDIR)\ap_mm.obj" \
"$(INTDIR)\ap_signal.obj" \
"$(INTDIR)\ap_slack.obj" \
- "$(INTDIR)\ap_snprintf.obj" \
-diff -Nru apache_1.3.12/src/ap/ap_ctx.c apache_1.3.12.new/src/ap/ap_ctx.c
---- apache_1.3.12/src/ap/ap_ctx.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/src/ap/ap_ctx.c Thu Dec 30 22:02:56 1999
+ "$(INTDIR)\ap_snprintf.obj"
+diff -urN apache_1.3.14.orig/src/ap/ap_ctx.c apache_1.3.14/src/ap/ap_ctx.c
+--- apache_1.3.14.orig/src/ap/ap_ctx.c Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/src/ap/ap_ctx.c Sat Nov 11 20:49:14 2000
@@ -0,0 +1,155 @@
+/* ====================================================================
+ * Copyright (c) 1998-2000 The Apache Group. All rights reserved.
+}
+
+#endif /* EAPI */
-diff -Nru apache_1.3.12/src/ap/ap_hook.c apache_1.3.12.new/src/ap/ap_hook.c
---- apache_1.3.12/src/ap/ap_hook.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/src/ap/ap_hook.c Thu Dec 30 22:02:56 1999
+diff -urN apache_1.3.14.orig/src/ap/ap_hook.c apache_1.3.14/src/ap/ap_hook.c
+--- apache_1.3.14.orig/src/ap/ap_hook.c Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/src/ap/ap_hook.c Sat Nov 11 20:49:14 2000
@@ -0,0 +1,930 @@
+#if 0
+=pod
+
+=pod
+*/
-diff -Nru apache_1.3.12/src/ap/ap_mm.c apache_1.3.12.new/src/ap/ap_mm.c
---- apache_1.3.12/src/ap/ap_mm.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/src/ap/ap_mm.c Thu Dec 30 22:02:56 1999
+diff -urN apache_1.3.14.orig/src/ap/ap_mm.c apache_1.3.14/src/ap/ap_mm.c
+--- apache_1.3.14.orig/src/ap/ap_mm.c Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/src/ap/ap_mm.c Sat Nov 11 20:49:14 2000
@@ -0,0 +1,178 @@
+/* ====================================================================
+ * Copyright (c) 1999-2000 The Apache Group. All rights reserved.
+ STUB(mm_lib_version(), 0)
+
+#endif /* EAPI */
-diff -Nru apache_1.3.12/src/include/alloc.h apache_1.3.12.new/src/include/alloc.h
---- apache_1.3.12/src/include/alloc.h Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/include/alloc.h Mon Mar 13 19:30:30 2000
-@@ -93,6 +93,15 @@
-
+diff -urN apache_1.3.14.orig/src/include/ap_alloc.h apache_1.3.14/src/include/ap_alloc.h
+--- apache_1.3.14.orig/src/include/ap_alloc.h Fri Jun 2 01:42:23 2000
++++ apache_1.3.14/src/include/ap_alloc.h Sat Nov 11 20:49:14 2000
+@@ -94,6 +94,15 @@
pool * ap_init_alloc(void); /* Set up everything */
+ void ap_cleanup_alloc(void);
API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of permanent_pool */
+#if defined(EAPI)
+typedef enum { AP_POOL_RD, AP_POOL_RW } ap_pool_lock_mode;
API_EXPORT(void) ap_destroy_pool(pool *);
/* pools have nested lifetimes -- sub_pools are destroyed when the
-diff -Nru apache_1.3.12/src/include/ap_ctx.h apache_1.3.12.new/src/include/ap_ctx.h
---- apache_1.3.12/src/include/ap_ctx.h Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/src/include/ap_ctx.h Thu Dec 30 22:02:59 1999
+diff -urN apache_1.3.14.orig/src/include/ap_ctx.h apache_1.3.14/src/include/ap_ctx.h
+--- apache_1.3.14.orig/src/include/ap_ctx.h Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/src/include/ap_ctx.h Sat Nov 11 20:49:14 2000
@@ -0,0 +1,110 @@
+/* ====================================================================
+ * Copyright (c) 1998-2000 The Apache Group. All rights reserved.
+#endif /* AP_CTX_H */
+
+#endif /* EAPI */
-diff -Nru apache_1.3.12/src/include/ap_hook.h apache_1.3.12.new/src/include/ap_hook.h
---- apache_1.3.12/src/include/ap_hook.h Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/src/include/ap_hook.h Thu Dec 30 22:02:59 1999
+diff -urN apache_1.3.14.orig/src/include/ap_hook.h apache_1.3.14/src/include/ap_hook.h
+--- apache_1.3.14.orig/src/include/ap_hook.h Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/src/include/ap_hook.h Sat Nov 11 20:49:14 2000
@@ -0,0 +1,710 @@
+#if 0
+=cut
+
+=cut
+*/
-diff -Nru apache_1.3.12/src/include/ap_mm.h apache_1.3.12.new/src/include/ap_mm.h
---- apache_1.3.12/src/include/ap_mm.h Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/src/include/ap_mm.h Thu Dec 30 22:02:59 1999
+diff -urN apache_1.3.14.orig/src/include/ap_mm.h apache_1.3.14/src/include/ap_mm.h
+--- apache_1.3.14.orig/src/include/ap_mm.h Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/src/include/ap_mm.h Sat Nov 11 20:49:14 2000
@@ -0,0 +1,130 @@
+/* ====================================================================
+ * Copyright (c) 1999-2000 The Apache Group. All rights reserved.
+
+#endif /* EAPI */
+
-diff -Nru apache_1.3.12/src/include/ap_mmn.h apache_1.3.12.new/src/include/ap_mmn.h
---- apache_1.3.12/src/include/ap_mmn.h Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/include/ap_mmn.h Mon Mar 13 19:30:30 2000
-@@ -229,7 +229,23 @@
- * 19990320.7 - add ap_strcasestr()
+diff -urN apache_1.3.14.orig/src/include/ap_mmn.h apache_1.3.14/src/include/ap_mmn.h
+--- apache_1.3.14.orig/src/include/ap_mmn.h Tue Oct 3 18:39:38 2000
++++ apache_1.3.14/src/include/ap_mmn.h Sat Nov 11 20:49:14 2000
+@@ -232,7 +232,23 @@
+ * 19990320.10 - add ap_is_rdirectory() and ap_stripprefix()
*/
+/*
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 19990320
-diff -Nru apache_1.3.12/src/include/buff.h apache_1.3.12.new/src/include/buff.h
---- apache_1.3.12/src/include/buff.h Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/include/buff.h Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/include/buff.h apache_1.3.14/src/include/buff.h
+--- apache_1.3.14.orig/src/include/buff.h Fri Jan 1 20:04:39 1999
++++ apache_1.3.14/src/include/buff.h Sat Nov 11 20:49:14 2000
@@ -124,6 +124,10 @@
/* transport handle, for RPC binding handle or some such */
void *t_handle;
#ifndef CHARSET_EBCDIC
-diff -Nru apache_1.3.12/src/include/http_conf_globals.h apache_1.3.12.new/src/include/http_conf_globals.h
---- apache_1.3.12/src/include/http_conf_globals.h Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/include/http_conf_globals.h Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/include/http_conf_globals.h apache_1.3.14/src/include/http_conf_globals.h
+--- apache_1.3.14.orig/src/include/http_conf_globals.h Tue Oct 10 15:21:20 2000
++++ apache_1.3.14/src/include/http_conf_globals.h Sat Nov 11 20:49:14 2000
@@ -91,6 +91,9 @@
extern int ap_listenbacklog;
extern int ap_dump_settings;
+extern API_VAR_EXPORT ap_ctx *ap_global_ctx;
+#endif /* EAPI */
- extern char *ap_pid_fname;
- extern char *ap_scoreboard_fname;
-diff -Nru apache_1.3.12/src/include/http_config.h apache_1.3.12.new/src/include/http_config.h
---- apache_1.3.12/src/include/http_config.h Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/include/http_config.h Mon Mar 13 19:30:30 2000
+ extern API_VAR_EXPORT char *ap_pid_fname;
+ extern API_VAR_EXPORT char *ap_scoreboard_fname;
+diff -urN apache_1.3.14.orig/src/include/http_config.h apache_1.3.14/src/include/http_config.h
+--- apache_1.3.14.orig/src/include/http_config.h Fri Jun 2 01:42:23 2000
++++ apache_1.3.14/src/include/http_config.h Sat Nov 11 20:49:14 2000
@@ -275,6 +275,65 @@
void (*child_exit) (server_rec *, pool *);
#endif
} module;
/* Initializer for the first few module slots, which are only
-diff -Nru apache_1.3.12/src/include/http_main.h apache_1.3.12.new/src/include/http_main.h
---- apache_1.3.12/src/include/http_main.h Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/include/http_main.h Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/include/http_main.h apache_1.3.14/src/include/http_main.h
+--- apache_1.3.14.orig/src/include/http_main.h Thu Jun 15 21:18:26 2000
++++ apache_1.3.14/src/include/http_main.h Sat Nov 11 20:49:14 2000
@@ -124,7 +124,11 @@
API_EXPORT(void) ap_sync_scoreboard_image(void);
int ap_update_child_status(int child_num, int status, request_rec *r);
+#endif
API_EXPORT(int) ap_check_alarm(void);
- #ifndef NO_OTHER_CHILD
-diff -Nru apache_1.3.12/src/include/httpd.h apache_1.3.12.new/src/include/httpd.h
---- apache_1.3.12/src/include/httpd.h Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/include/httpd.h Mon Mar 13 19:30:30 2000
+ void setup_signal_names(char *prefix);
+diff -urN apache_1.3.14.orig/src/include/httpd.h apache_1.3.14/src/include/httpd.h
+--- apache_1.3.14.orig/src/include/httpd.h Tue Oct 10 22:13:03 2000
++++ apache_1.3.14/src/include/httpd.h Sat Nov 11 20:57:42 2000
@@ -69,7 +69,19 @@
/* Headers in which EVERYONE has an interest... */
+#ifdef EAPI
+#include "ap_mm.h"
+#endif
- #include "alloc.h"
+ #include "ap_alloc.h"
+/*
+ * Include the Extended API headers.
+ * Don't move the position. It has to be after alloc.h because it uses the
/* Number of requests to try to handle in a single process. If <= 0,
* the children don't die off. That's the default here, since I'm still
* interested in finding and stanching leaks.
-@@ -438,6 +468,9 @@
+@@ -445,6 +475,9 @@
API_EXPORT(const char *) ap_get_server_version(void);
API_EXPORT(void) ap_add_version_component(const char *component);
API_EXPORT(const char *) ap_get_server_built(void);
/* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
* Always increases along the same track as the source branch.
-@@ -819,6 +852,10 @@
+@@ -837,6 +870,10 @@
* record to improve 64bit alignment the next time we need to break
* binary compatibility for some other reason.
*/
};
-@@ -867,6 +904,9 @@
+@@ -885,6 +922,9 @@
char *local_host; /* used for ap_get_server_name when
* UseCanonicalName is set to DNS
* (ignores setting of HostnameLookups) */
};
/* Per-vhost config... */
-@@ -939,6 +979,10 @@
+@@ -957,6 +997,10 @@
int limit_req_line; /* limit on size of the HTTP request line */
int limit_req_fieldsize; /* limit on size of any request header field */
int limit_req_fields; /* limit on number of request header fields */
};
/* These are more like real hosts than virtual hosts */
-diff -Nru apache_1.3.12/src/main/alloc.c apache_1.3.12.new/src/main/alloc.c
---- apache_1.3.12/src/main/alloc.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/main/alloc.c Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/main/alloc.c apache_1.3.14/src/main/alloc.c
+--- apache_1.3.14.orig/src/main/alloc.c Fri Jul 14 16:17:35 2000
++++ apache_1.3.14/src/main/alloc.c Sat Nov 11 20:49:14 2000
@@ -63,6 +63,10 @@
*/
#ifdef ALLOC_STATS
static void dump_stats(void)
{
-@@ -519,14 +611,74 @@
- return permanent_pool;
+@@ -525,14 +617,74 @@
+ ap_destroy_mutex(spawn_mutex);
}
+#if defined(EAPI)
/* Don't hold the mutex during cleanups. */
run_cleanups(a->cleanups);
a->cleanups = NULL;
-@@ -560,6 +712,10 @@
+@@ -566,6 +718,10 @@
ap_block_alarms();
ap_clear_pool(a);
(void) ap_acquire_mutex(alloc_mutex);
if (a->parent) {
if (a->parent->sub_pools == a)
-@@ -570,6 +726,10 @@
+@@ -576,6 +732,10 @@
a->sub_next->sub_prev = a->sub_prev;
}
(void) ap_release_mutex(alloc_mutex);
free_blocks(a->first);
ap_unblock_alarms();
-@@ -584,6 +744,30 @@
+@@ -590,6 +750,30 @@
return bytes_in_block_list(block_freelist);
}
/*****************************************************************
* POOL_DEBUG support
*/
-@@ -749,16 +933,31 @@
+@@ -755,16 +939,31 @@
ap_block_alarms();
ap_unblock_alarms();
-@@ -870,6 +1069,11 @@
+@@ -876,6 +1075,11 @@
char *ptr;
size = (char *)ps->vbuff.curpos - ps->base;
ptr = realloc(ps->base, 2*size);
if (ptr == NULL) {
fputs("Ouch! Out of memory!\n", stderr);
-@@ -890,9 +1094,21 @@
+@@ -896,9 +1100,21 @@
cur_len = strp - blok->h.first_avail;
/* must try another blok */
memcpy(nblok->h.first_avail, blok->h.first_avail, cur_len);
ps->vbuff.curpos = nblok->h.first_avail + cur_len;
/* save a byte for the NUL terminator */
-@@ -901,10 +1117,18 @@
+@@ -907,10 +1123,18 @@
/* did we allocate the current blok? if so free it up */
if (ps->got_a_new_block) {
debug_fill(blok->h.first_avail, blok->h.endp - blok->h.first_avail);
}
ps->blok = nblok;
ps->got_a_new_block = 1;
-@@ -923,6 +1147,11 @@
+@@ -929,6 +1153,11 @@
void *ptr;
ap_block_alarms();
ps.base = malloc(512);
if (ps.base == NULL) {
fputs("Ouch! Out of memory!\n", stderr);
-@@ -935,6 +1164,11 @@
+@@ -941,6 +1170,11 @@
*ps.vbuff.curpos++ = '\0';
ptr = ps.base;
/* shrink */
ptr = realloc(ptr, (char *)ps.vbuff.curpos - (char *)ptr);
if (ptr == NULL) {
fputs("Ouch! Out of memory!\n", stderr);
-diff -Nru apache_1.3.12/src/main/buff.c apache_1.3.12.new/src/main/buff.c
---- apache_1.3.12/src/main/buff.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/main/buff.c Mon Mar 13 19:30:30 2000
-@@ -125,7 +125,11 @@
+diff -urN apache_1.3.14.orig/src/main/buff.c apache_1.3.14/src/main/buff.c
+--- apache_1.3.14.orig/src/main/buff.c Tue Sep 26 23:03:42 2000
++++ apache_1.3.14/src/main/buff.c Sat Nov 11 20:49:14 2000
+@@ -126,7 +126,11 @@
select() sometimes returns 1 even though the write will block. We must work around this.
*/
{
int iostate = 1;
fd_set fdset;
-@@ -193,8 +197,11 @@
+@@ -194,8 +198,11 @@
return (rv);
}
{
int iostate = 1;
fd_set fdset;
-@@ -257,6 +264,9 @@
+@@ -273,6 +280,9 @@
}
else
#endif
rv = read(fb->fd_in, buf, nbyte);
return rv;
-@@ -268,6 +278,9 @@
+@@ -284,6 +294,9 @@
#if defined (WIN32) || defined(NETWARE)
if (fb->flags & B_SOCKET) {
rv = recvwithtimeout(fb->fd_in, buf, nbyte, 0);
if (rv == SOCKET_ERROR)
errno = WSAGetLastError();
-@@ -315,6 +328,9 @@
+@@ -331,6 +344,9 @@
}
else
#endif
#if defined (B_SFIO)
rv = sfwrite(fb->sf_out, buf, nbyte);
#else
-@@ -341,6 +357,9 @@
+@@ -357,6 +373,9 @@
#if defined(WIN32) || defined(NETWARE)
if (fb->flags & B_SOCKET) {
rv = sendwithtimeout(fb->fd, buf, nbyte, 0);
if (rv == SOCKET_ERROR)
errno = WSAGetLastError();
-@@ -421,6 +440,10 @@
+@@ -437,6 +456,10 @@
(size_t) SF_UNBOUND, 1, SF_WRITE);
#endif
return fb;
}
-@@ -1067,6 +1090,9 @@
+@@ -1083,6 +1106,9 @@
i = 0;
while (i < nvec) {
do
rv = writev(fb->fd, &vec[i], nvec - i);
while (rv == -1 && (errno == EINTR || errno == EAGAIN)
&& !(fb->flags & B_EOUT));
-diff -Nru apache_1.3.12/src/main/http_config.c apache_1.3.12.new/src/main/http_config.c
---- apache_1.3.12/src/main/http_config.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/main/http_config.c Mon Mar 13 19:30:30 2000
-@@ -582,6 +582,20 @@
+diff -urN apache_1.3.14.orig/src/main/http_config.c apache_1.3.14/src/main/http_config.c
+--- apache_1.3.14.orig/src/main/http_config.c Tue Oct 3 18:39:40 2000
++++ apache_1.3.14/src/main/http_config.c Sat Nov 11 20:49:14 2000
+@@ -598,6 +598,20 @@
m->name = tmp;
}
#endif /*_OSD_POSIX*/
}
/*
-@@ -596,6 +610,21 @@
+@@ -612,6 +626,21 @@
{
module *modp;
modp = top_module;
if (modp == m) {
/* We are the top module, special case */
-@@ -985,6 +1014,27 @@
+@@ -1005,6 +1034,27 @@
const command_rec *cmd;
module *mod = top_module;
if ((l[0] == '#') || (!l[0]))
return NULL;
-@@ -1334,6 +1384,10 @@
+@@ -1433,6 +1483,10 @@
s->limit_req_fieldsize = main_server->limit_req_fieldsize;
s->limit_req_fields = main_server->limit_req_fields;
*ps = s;
return ap_parse_vhost_addrs(p, hostname, s);
-@@ -1444,6 +1498,10 @@
+@@ -1543,6 +1597,10 @@
s->module_config = create_server_config(p, s);
s->lookup_defaults = create_default_per_dir_config(p);
return s;
}
-diff -Nru apache_1.3.12/src/main/http_main.c apache_1.3.12.new/src/main/http_main.c
---- apache_1.3.12/src/main/http_main.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/main/http_main.c Mon Mar 13 19:30:30 2000
+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 Sat Nov 11 20:44:14 2000
++++ apache_1.3.14/src/main/http_main.c Sat Nov 11 20:53:13 2000
@@ -259,6 +259,9 @@
int ap_listenbacklog;
int ap_dump_settings = 0;
/*
* The max child slot ever assigned, preserved across restarts. Necessary
-@@ -441,6 +444,30 @@
+@@ -444,6 +447,30 @@
}
}
#ifndef NETWARE
static APACHE_TLS int volatile exit_after_unblock = 0;
#endif
-@@ -1191,6 +1218,10 @@
+@@ -1208,6 +1235,10 @@
ap_log_transaction(log_req);
}
ap_bsetflag(save_req->connection->client, B_EOUT, 1);
ap_bclose(save_req->connection->client);
-@@ -1199,6 +1230,9 @@
+@@ -1216,6 +1247,9 @@
ap_longjmp(jmpbuffer, 1);
}
else { /* abort the connection */
ap_bsetflag(current_conn->client, B_EOUT, 1);
ap_bclose(current_conn->client);
current_conn->aborted = 1;
-@@ -1264,7 +1298,11 @@
+@@ -1281,7 +1315,11 @@
}
#endif
{
unsigned int old;
-@@ -1500,10 +1538,16 @@
+@@ -1517,10 +1555,16 @@
/* Send any leftover data to the client, but never try to again */
if (ap_bflush(r->connection->client) == -1) {
ap_bsetflag(r->connection->client, B_EOUT, 1);
/* Close our half of the connection --- send the client a FIN */
-@@ -2203,6 +2247,9 @@
- #endif
+@@ -2231,6 +2275,9 @@
/* Clear the pool - including any registered cleanups */
ap_destroy_pool(pglobal);
+ #endif
+#ifdef EAPI
+ ap_kill_alloc_shared();
+#endif
exit(code);
}
-@@ -3211,6 +3258,24 @@
+@@ -3224,6 +3271,24 @@
conn->remote_addr = *remaddr;
conn->remote_ip = ap_pstrdup(conn->pool,
inet_ntoa(conn->remote_addr.sin_addr));
return conn;
}
-@@ -3617,6 +3682,15 @@
+@@ -3645,6 +3710,15 @@
printf("Server's Module Magic Number: %u:%u\n",
MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
printf("Server compiled with....\n");
#ifdef BIG_SECURITY_HOLE
printf(" -D BIG_SECURITY_HOLE\n");
#endif
-@@ -3770,6 +3844,22 @@
+@@ -3798,6 +3872,22 @@
ap_server_pre_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *));
}
#ifndef MULTITHREAD
-@@ -4191,6 +4281,9 @@
+@@ -4217,6 +4307,9 @@
ap_sync_scoreboard_image();
if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
ap_bclose(conn_io);
clean_child_exit(0);
}
-@@ -4219,6 +4312,9 @@
+@@ -4245,6 +4338,9 @@
*/
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -4229,6 +4325,9 @@
+@@ -4255,6 +4351,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -4953,16 +5052,31 @@
+@@ -4979,16 +5078,31 @@
usage(argv[0]);
}
}
}
child_timeouts = !ap_standalone || one_process;
-@@ -5098,6 +5212,10 @@
+@@ -5122,6 +5236,10 @@
ap_destroy_pool(r->pool);
}
ap_bclose(cio);
}
exit(0);
-@@ -5449,6 +5567,9 @@
+@@ -5468,6 +5586,9 @@
ap_kill_cleanups_for_socket(ptrans, csd);
#ifdef NO_LINGCLOSE
ap_bclose(conn_io); /* just close it */
#else
if (r && r->connection
-@@ -5459,6 +5580,9 @@
+@@ -5478,6 +5599,9 @@
lingering_close(r);
}
else {
ap_bsetflag(conn_io, B_EOUT, 1);
ap_bclose(conn_io);
}
-@@ -6785,6 +6909,9 @@
+@@ -6878,6 +7002,9 @@
}
}
if (!ap_os_is_path_absolute(ap_server_confname)) {
char *full_conf_path;
-@@ -6818,6 +6945,10 @@
+@@ -6929,6 +7056,10 @@
}
- #endif
+ #else /* ndef WIN32 */
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
++#endif
+
+#ifdef EAPI
+ ap_init_alloc_shared(FALSE);
-+#endif
+ #endif
if (ap_configtestonly) {
- fprintf(stderr, "%s: Syntax OK\n", ap_server_root_relative(pcommands, ap_server_confname));
-diff -Nru apache_1.3.12/src/main/http_protocol.c apache_1.3.12.new/src/main/http_protocol.c
---- apache_1.3.12/src/main/http_protocol.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/main/http_protocol.c Mon Mar 13 19:30:30 2000
-@@ -1028,6 +1028,10 @@
+diff -urN apache_1.3.14.orig/src/main/http_protocol.c apache_1.3.14/src/main/http_protocol.c
+--- apache_1.3.14.orig/src/main/http_protocol.c Tue Oct 10 05:29:08 2000
++++ apache_1.3.14/src/main/http_protocol.c Sat Nov 11 20:49:14 2000
+@@ -1039,6 +1039,10 @@
r->status = HTTP_REQUEST_TIME_OUT; /* Until we get a request */
r->the_request = NULL;
#ifdef CHARSET_EBCDIC
ap_bsetflag(r->connection->client, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
#endif
-@@ -1174,6 +1178,11 @@
+@@ -1185,6 +1189,11 @@
rnew->read_body = REQUEST_NO_BODY;
rnew->main = (request_rec *) r;
}
void ap_finalize_sub_req_protocol(request_rec *sub)
-diff -Nru apache_1.3.12/src/main/http_request.c apache_1.3.12.new/src/main/http_request.c
---- apache_1.3.12/src/main/http_request.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/main/http_request.c Mon Mar 13 19:30:30 2000
-@@ -1316,6 +1316,9 @@
+diff -urN apache_1.3.14.orig/src/main/http_request.c apache_1.3.14/src/main/http_request.c
+--- apache_1.3.14.orig/src/main/http_request.c Fri Sep 22 20:42:42 2000
++++ apache_1.3.14/src/main/http_request.c Sat Nov 11 20:49:14 2000
+@@ -1383,6 +1383,9 @@
new->no_local_copy = r->no_local_copy;
new->read_length = r->read_length; /* We can only read it once */
new->vlist_validator = r->vlist_validator;
ap_table_setn(new->subprocess_env, "REDIRECT_STATUS",
ap_psprintf(r->pool, "%d", r->status));
-diff -Nru apache_1.3.12/src/modules/extra/mod_define.c apache_1.3.12.new/src/modules/extra/mod_define.c
---- apache_1.3.12/src/modules/extra/mod_define.c Thu Jan 1 01:00:00 1970
-+++ apache_1.3.12.new/src/modules/extra/mod_define.c Thu Dec 30 22:00:58 1999
+diff -urN apache_1.3.14.orig/src/modules/extra/mod_define.c apache_1.3.14/src/modules/extra/mod_define.c
+--- apache_1.3.14.orig/src/modules/extra/mod_define.c Thu Jan 1 01:00:00 1970
++++ apache_1.3.14/src/modules/extra/mod_define.c Sat Nov 11 20:49:14 2000
@@ -0,0 +1,416 @@
+/*
+** mod_define.c - Apache module for configuration defines ($xxx)
+ NULL /* EAPI: new_connection */
+};
+
-diff -Nru apache_1.3.12/src/modules/proxy/mod_proxy.c apache_1.3.12.new/src/modules/proxy/mod_proxy.c
---- apache_1.3.12/src/modules/proxy/mod_proxy.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/modules/proxy/mod_proxy.c Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/modules/proxy/mod_proxy.c apache_1.3.14/src/modules/proxy/mod_proxy.c
+--- apache_1.3.14.orig/src/modules/proxy/mod_proxy.c Fri Jun 2 01:42:26 2000
++++ apache_1.3.14/src/modules/proxy/mod_proxy.c Sat Nov 11 20:49:14 2000
@@ -214,6 +214,9 @@
static int proxy_fixup(request_rec *r)
{
};
-diff -Nru apache_1.3.12/src/modules/proxy/proxy_http.c apache_1.3.12.new/src/modules/proxy/proxy_http.c
---- apache_1.3.12/src/modules/proxy/proxy_http.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/modules/proxy/proxy_http.c Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/modules/proxy/proxy_http.c apache_1.3.14/src/modules/proxy/proxy_http.c
+--- apache_1.3.14.orig/src/modules/proxy/proxy_http.c Tue Feb 29 15:24:27 2000
++++ apache_1.3.14/src/modules/proxy/proxy_http.c Sat Nov 11 20:49:14 2000
@@ -189,6 +189,9 @@
const char *urlptr = NULL;
const char *datestr;
if (conf->viaopt == via_block) {
/* Block all outgoing Via: headers */
-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 Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/modules/standard/mod_log_config.c Mon Mar 13 19:30:30 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 Fri Jun 2 01:42:28 2000
++++ apache_1.3.14/src/modules/standard/mod_log_config.c Sat Nov 11 20:49:14 2000
@@ -257,6 +257,9 @@
typedef const char *(*item_key_func) (request_rec *, char *);
cp = (*item->func) (item->want_orig ? orig : r, item->arg);
return cp ? cp : "-";
}
-diff -Nru apache_1.3.12/src/modules/standard/mod_rewrite.c apache_1.3.12.new/src/modules/standard/mod_rewrite.c
---- apache_1.3.12/src/modules/standard/mod_rewrite.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/modules/standard/mod_rewrite.c Mon Mar 13 19:30:30 2000
-@@ -3770,6 +3770,15 @@
+diff -urN apache_1.3.14.orig/src/modules/standard/mod_rewrite.c apache_1.3.14/src/modules/standard/mod_rewrite.c
+--- apache_1.3.14.orig/src/modules/standard/mod_rewrite.c Fri Sep 22 22:47:19 2000
++++ apache_1.3.14/src/modules/standard/mod_rewrite.c Sat Nov 11 20:49:14 2000
+@@ -3613,6 +3613,15 @@
}
#endif /* ndef WIN32 && NETWARE*/
if (result == NULL) {
return ap_pstrdup(r->pool, "");
}
-diff -Nru apache_1.3.12/src/modules/standard/mod_so.c apache_1.3.12.new/src/modules/standard/mod_so.c
---- apache_1.3.12/src/modules/standard/mod_so.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/modules/standard/mod_so.c Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/modules/standard/mod_so.c apache_1.3.14/src/modules/standard/mod_so.c
+--- apache_1.3.14.orig/src/modules/standard/mod_so.c Tue May 4 13:21:14 1999
++++ apache_1.3.14/src/modules/standard/mod_so.c Sat Nov 11 20:49:14 2000
@@ -257,11 +257,24 @@
* Make sure the found module structure is really a module structure
*
/*
* Add this module to the Apache core structures
-diff -Nru apache_1.3.12/src/modules/standard/mod_status.c apache_1.3.12.new/src/modules/standard/mod_status.c
---- apache_1.3.12/src/modules/standard/mod_status.c Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/modules/standard/mod_status.c Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/modules/standard/mod_status.c apache_1.3.14/src/modules/standard/mod_status.c
+--- apache_1.3.14.orig/src/modules/standard/mod_status.c Fri Jun 2 01:42:29 2000
++++ apache_1.3.14/src/modules/standard/mod_status.c Sat Nov 11 20:49:14 2000
@@ -475,12 +475,33 @@
if (no_table_report)
ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
} else {
-diff -Nru apache_1.3.12/src/support/apxs.pl apache_1.3.12.new/src/support/apxs.pl
---- apache_1.3.12/src/support/apxs.pl Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/support/apxs.pl Mon Mar 13 19:30:30 2000
+diff -urN apache_1.3.14.orig/src/support/apxs.pl apache_1.3.14/src/support/apxs.pl
+--- apache_1.3.14.orig/src/support/apxs.pl Sat Nov 11 20:44:14 2000
++++ apache_1.3.14/src/support/apxs.pl Sat Nov 11 20:49:14 2000
@@ -651,5 +651,11 @@
NULL, /* child_init */
NULL, /* child_exit */
+#endif
};
-diff -Nru apache_1.3.12/src/support/httpd.exp apache_1.3.12.new/src/support/httpd.exp
---- apache_1.3.12/src/support/httpd.exp Mon Mar 13 19:38:44 2000
-+++ apache_1.3.12.new/src/support/httpd.exp Mon Mar 13 19:30:30 2000
-@@ -413,3 +413,59 @@
+diff -urN apache_1.3.14.orig/src/support/httpd.exp apache_1.3.14/src/support/httpd.exp
+--- apache_1.3.14.orig/src/support/httpd.exp Tue Oct 10 20:05:25 2000
++++ apache_1.3.14/src/support/httpd.exp Sat Nov 11 20:49:14 2000
+@@ -421,3 +421,59 @@
XML_SetUnparsedEntityDeclHandler
XML_SetUserData
XML_UseParserAsHandlerArg
-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;
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 <limits.h>
+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 @@
/*
+ 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 */
projects / packages / apache.git / commitdiff