randy 98/08/12 18:55:26
Modified: src CHANGES
src/main http_config.c http_main.c
src/modules/standard mod_info.c mod_rewrite.c
src/os/win32 ApacheModuleAuthAnon.mak
ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
ApacheModuleExpires.mak ApacheModuleHeaders.mak
ApacheModuleInfo.mak ApacheModuleRewrite.mak
ApacheModuleSpeling.mak ApacheModuleStatus.mak
ApacheModuleUserTrack.mak Module.mak.tmpl
Log:
Split MODULE_MAGIC_NUMBER into _MAJOR/_MINOR numbers. This should
provide a way to trace API changes that add functionality but do
not create a compatibility issue for precompiled modules, etc.
Submitted by: Randy Terbush <[EMAIL PROTECTED]>
Reviewed by: Martin Kraemer, Jim Jagielski
Revision Changes Path
1.1023 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1022
retrieving revision 1.1023
diff -u -r1.1022 -r1.1023
--- CHANGES 1998/08/12 11:33:35 1.1022
+++ CHANGES 1998/08/13 01:54:59 1.1023
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) Split MODULE_MAGIC_NUMBER into _MAJOR/_MINOR numbers. This should
+ provide a way to trace API changes that add functionality but do
+ not create a compatibility issue for precompiled modules, etc.
+ [Randy Terbush]
+
*) Fix suexec installation under `make install root=xxx' situation.
[Ralf S. Engelschall]
1.125 +2 -7 apache-1.3/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- http_config.c 1998/08/11 15:47:59 1.124
+++ http_config.c 1998/08/13 01:55:06 1.125
@@ -538,15 +538,10 @@
* teased out...
*/
- /* At some point, we may want to offer back-compatibility for
- * loading modules that are for older versions of Apache. For now,
- * though, we don't.
- */
-
- if (m->version != MODULE_MAGIC_NUMBER) {
+ if (m->version != MODULE_MAGIC_NUMBER_MAJOR) {
fprintf(stderr, "httpd: module \"%s\" is not compatible with this "
"version of Apache.\n", m->name);
- fprintf(stderr, "Please contact the author for the correct version.\n");
+ fprintf(stderr, "Please contact the vendor for the correct version.\n");
exit(1);
}
1.387 +2 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- http_main.c 1998/08/12 19:22:18 1.386
+++ http_main.c 1998/08/13 01:55:06 1.387
@@ -3224,7 +3224,8 @@
{
printf("Server version: %s\n", ap_get_server_version());
printf("Server built: %s\n", ap_get_server_built());
- printf("Server's Module Magic Number: %u\n", MODULE_MAGIC_NUMBER);
+ 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");
1.42 +2 -2 apache-1.3/src/modules/standard/mod_info.c
Index: mod_info.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_info.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mod_info.c 1998/08/06 17:30:59 1.41
+++ mod_info.c 1998/08/13 01:55:14 1.42
@@ -406,8 +406,8 @@
"<font size=+1><tt>%s</tt></a></font><br>\n",
ap_get_server_built());
ap_rprintf(r, "<strong>API Version:</strong> "
- "<tt>%d</tt><br>\n",
- MODULE_MAGIC_NUMBER);
+ "<tt>%d:%d</tt><br>\n",
+ MODULE_MAGIC_NUMBER_MAJOR:MODULE_MAGIC_NUMBER_MINOR);
ap_rprintf(r, "<strong>Run Mode:</strong> <tt>%s</tt><br>\n",
(ap_standalone ? "standalone" : "inetd"));
ap_rprintf(r, "<strong>User/Group:</strong> "
1.129 +2 -1 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mod_rewrite.c 1998/08/06 17:31:05 1.128
+++ mod_rewrite.c 1998/08/13 01:55:15 1.129
@@ -3585,7 +3585,8 @@
result = ap_get_server_version();
}
else if (strcasecmp(var, "API_VERSION") == 0) { /* non-standard */
- ap_snprintf(resultbuf, sizeof(resultbuf), "%d", MODULE_MAGIC_NUMBER);
+ ap_snprintf(resultbuf, sizeof(resultbuf), "%d:%d",
+ MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
result = resultbuf;
}
1.12 +2 -0 apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak
Index: ApacheModuleAuthAnon.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheModuleAuthAnon.mak 1998/04/09 08:20:31 1.11
+++ ApacheModuleAuthAnon.mak 1998/08/13 01:55:21 1.12
@@ -184,6 +184,7 @@
DEP_CPP_MOD_A=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -214,6 +215,7 @@
DEP_CPP_MOD_A=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.12 +2 -0 apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak
Index: ApacheModuleCERNMeta.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheModuleCERNMeta.mak 1998/04/09 08:20:31 1.11
+++ ApacheModuleCERNMeta.mak 1998/08/13 01:55:22 1.12
@@ -184,6 +184,7 @@
DEP_CPP_MOD_C=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -213,6 +214,7 @@
DEP_CPP_MOD_C=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.13 +2 -0 apache-1.3/src/os/win32/ApacheModuleDigest.mak
Index: ApacheModuleDigest.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.mak,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApacheModuleDigest.mak 1998/05/29 18:21:03 1.12
+++ ApacheModuleDigest.mak 1998/08/13 01:55:22 1.13
@@ -183,6 +183,7 @@
DEP_CPP_MOD_D=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -214,6 +215,7 @@
DEP_CPP_MOD_D=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.12 +2 -0 apache-1.3/src/os/win32/ApacheModuleExpires.mak
Index: ApacheModuleExpires.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleExpires.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheModuleExpires.mak 1998/04/09 08:20:32 1.11
+++ ApacheModuleExpires.mak 1998/08/13 01:55:22 1.12
@@ -183,6 +183,7 @@
DEP_CPP_MOD_E=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -210,6 +211,7 @@
DEP_CPP_MOD_E=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.12 +2 -0 apache-1.3/src/os/win32/ApacheModuleHeaders.mak
Index: ApacheModuleHeaders.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleHeaders.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheModuleHeaders.mak 1998/04/09 08:20:32 1.11
+++ ApacheModuleHeaders.mak 1998/08/13 01:55:22 1.12
@@ -183,6 +183,7 @@
DEP_CPP_MOD_H=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -209,6 +210,7 @@
DEP_CPP_MOD_H=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.9 +1 -0 apache-1.3/src/os/win32/ApacheModuleInfo.mak
Index: ApacheModuleInfo.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleInfo.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApacheModuleInfo.mak 1998/04/09 08:20:32 1.8
+++ ApacheModuleInfo.mak 1998/08/13 01:55:23 1.9
@@ -178,6 +178,7 @@
DEP_CPP_MOD_I=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.12 +2 -0 apache-1.3/src/os/win32/ApacheModuleRewrite.mak
Index: ApacheModuleRewrite.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheModuleRewrite.mak 1998/04/09 08:20:32 1.11
+++ ApacheModuleRewrite.mak 1998/08/13 01:55:23 1.12
@@ -191,6 +191,7 @@
DEP_CPP_MOD_R=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -214,6 +215,7 @@
DEP_CPP_MOD_R=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.6 +2 -0 apache-1.3/src/os/win32/ApacheModuleSpeling.mak
Index: ApacheModuleSpeling.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleSpeling.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleSpeling.mak 1998/04/09 08:20:32 1.5
+++ ApacheModuleSpeling.mak 1998/08/13 01:55:23 1.6
@@ -183,6 +183,7 @@
DEP_CPP_MOD_S=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -211,6 +212,7 @@
DEP_CPP_MOD_S=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.14 +2 -0 apache-1.3/src/os/win32/ApacheModuleStatus.mak
Index: ApacheModuleStatus.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ApacheModuleStatus.mak 1998/08/12 19:22:20 1.13
+++ ApacheModuleStatus.mak 1998/08/13 01:55:23 1.14
@@ -217,6 +217,7 @@
DEP_CPP_MOD_S=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
"..\..\include\buff.h"\
@@ -244,6 +245,7 @@
DEP_CPP_MOD_S=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\ap_config.h"\
"..\..\include\ap_ctype.h"\
"..\..\include\buff.h"\
1.12 +2 -0 apache-1.3/src/os/win32/ApacheModuleUserTrack.mak
Index: ApacheModuleUserTrack.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleUserTrack.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheModuleUserTrack.mak 1998/04/09 08:20:33 1.11
+++ ApacheModuleUserTrack.mak 1998/08/13 01:55:23 1.12
@@ -184,6 +184,7 @@
DEP_CPP_MOD_U=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
@@ -211,6 +212,7 @@
DEP_CPP_MOD_U=\
"..\..\include\alloc.h"\
"..\..\include\ap.h"\
+ "..\..\include\ap_mmn.h"\
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\hsregex.h"\
1.2 +1 -0 apache-1.3/src/os/win32/Module.mak.tmpl
Index: Module.mak.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/win32/Module.mak.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Module.mak.tmpl 1997/07/17 20:01:40 1.1
+++ Module.mak.tmpl 1998/08/13 01:55:24 1.2
@@ -211,6 +211,7 @@
"..\http_request.h"\
"..\httpd.h"\
"..\regex\regex.h"\
+ "..\ap_mmn.h"\
".\readdir.h"\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
