cvs commit: apache-1.3/src/include ap_mmn.h http_config.h httpd.h
randy 98/08/12 18:33:56 Modified:src/include http_config.h httpd.h Added: src/include ap_mmn.h Log: Move MAGIC_MODULE_NUMBER history into ap_mmn.h. Submitted by: Randy Terbush [EMAIL PROTECTED] Reviewed by: Martin Kraemer, Jim Jagielski Revision ChangesPath 1.95 +16 -6 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- http_config.h 1998/08/11 09:26:22 1.94 +++ http_config.h 1998/08/13 01:33:55 1.95 @@ -190,6 +190,9 @@ * check that module is compatible with this * version of the server. */ +int minor_version; /* API minor version. Provides API feature + * milestones. Not checked during module init + */ int module_index;/* Index to this modules structures in * config vectors. */ @@ -269,14 +272,21 @@ } module; /* Initializer for the first few module slots, which are only - * really set up once we start running. Note that the first word - * is a version check; this should allow us to deal with changes to - * the API (the server can detect an old-format module, and either - * handle it back-compatibly, or at least signal an error). + * really set up once we start running. Note that the first two slots + * provide a version check; this should allow us to deal with changes to + * the API. The major number should reflect changes to the API handler table + * itself or removal of functionality. The minor number should reflect + * additions of functionality to the existing API. (the server can detect + * an old-format module, and either handle it back-compatibly, or at least + * signal an error). See src/include/ap_mmn.h for MMN version history. */ -#define MODULE_MAGIC_NUMBER 19980811 -#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL +#define STANDARD_MODULE_STUFFMODULE_MAGIC_NUMBER_MAJOR, \ + MODULE_MAGIC_NUMBER_MINOR, \ + -1, \ + __FILE__, \ + NULL, \ + NULL /* Generic accessors for other modules to get at their own module-specific * data 1.236 +1 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- httpd.h 1998/08/11 09:26:22 1.235 +++ httpd.h 1998/08/13 01:33:55 1.236 @@ -72,6 +72,7 @@ #include alloc.h #include buff.h #include ap.h +#include ap_mmn.h /* MODULE_MAGIC_NUMBER_ macros */ /* - config dir -- */ 1.1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === /* * Copyright (c) 1998 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without *prior written permission. For written permission, please contact *[EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following *acknowledgment: *This product includes software
cvs commit: apache-1.3/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
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 ChangesPath
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.c1998/08/06 17:30:59 1.41
+++ mod_info.c1998/08/13 01:55:14 1.42
@@ -406,8 +406,8 @@
font size=+1tt%s/tt/a/fontbr\n,
ap_get_server_built());
ap_rprintf(r, strongAPI Version:/strong
-tt%d/ttbr\n,
-MODULE_MAGIC_NUMBER);
+tt%d:%d/ttbr\n,
+MODULE_MAGIC_NUMBER_MAJOR:MODULE_MAGIC_NUMBER_MINOR);
ap_rprintf(r, strongRun Mode:/strong tt%s/ttbr\n,
(ap_standalone ? standalone : inetd));
ap_rprintf(r, strongUser/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
cvs commit: apache-1.3/src/modules/standard mod_info.c
randy 98/08/12 19:51:41 Modified:src/include ap_mmn.h Log: Preserve backward compatibility. Pointed out by Roy and Rasmus. Revision ChangesPath 1.2 +1 -0 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap_mmn.h 1998/08/13 01:33:55 1.1 +++ ap_mmn.h 1998/08/13 02:51:27 1.2 @@ -166,5 +166,6 @@ #define MODULE_MAGIC_NUMBER_MAJOR 19980812 #endif #define MODULE_MAGIC_NUMBER_MINOR 0001 +#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ #endif /* !APACHE_AP_MMN_H */ Modified:src/modules/standard mod_info.c Log: Fix thinko. Revision ChangesPath 1.43 +1 -1 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.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mod_info.c1998/08/13 01:55:14 1.42 +++ mod_info.c1998/08/13 02:51:38 1.43 @@ -407,7 +407,7 @@ ap_get_server_built()); ap_rprintf(r, strongAPI Version:/strong tt%d:%d/ttbr\n, -MODULE_MAGIC_NUMBER_MAJOR:MODULE_MAGIC_NUMBER_MINOR); +MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR); ap_rprintf(r, strongRun Mode:/strong tt%s/ttbr\n, (ap_standalone ? standalone : inetd)); ap_rprintf(r, strongUser/Group:/strong
cvs commit: apache-1.3/src/include ap_config.h httpd.h
randy 98/08/12 19:59:34 Modified:src/include ap_config.h httpd.h Log: Try to preserve backward compatibility. Revision ChangesPath 1.231 +2 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- ap_config.h 1998/08/03 09:14:47 1.230 +++ ap_config.h 1998/08/13 02:59:32 1.231 @@ -67,6 +67,8 @@ * See PORTING for a listing of what they mean */ +#include ap_mmn.h /* MODULE_MAGIC_NUMBER_ */ + /* * Support for platform dependent autogenerated defines */ 1.237 +0 -1 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- httpd.h 1998/08/13 01:33:55 1.236 +++ httpd.h 1998/08/13 02:59:33 1.237 @@ -72,7 +72,6 @@ #include alloc.h #include buff.h #include ap.h -#include ap_mmn.h /* MODULE_MAGIC_NUMBER_ macros */ /* - config dir -- */
