You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/05/28 19:52:22 UTC
cvs commit: apache-2.0/src/include httpd.h
wrowe 00/05/28 10:52:20
Modified: src/os/win32 registry.c
src/include httpd.h
Log:
Remove any possiblity of having multiple tags to correct as the version
changes. Split httpd.h's version into tokens. Roll these tokens into
registry.c
TODO: Remove registry.c from the list of files to touch when rolling
Revision Changes Path
1.21 +5 -8 apache-2.0/src/os/win32/registry.c
Index: registry.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/registry.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- registry.c 2000/05/27 05:27:38 1.20
+++ registry.c 2000/05/28 17:52:15 1.21
@@ -87,16 +87,13 @@
#include "httpd.h"
#include "http_log.h"
-/* Define where the Apache values are stored in the registry. In general
- * VERSION will be the same across all beta releases for a particular
- * major release, but will change when the final release is made.
+/* Define where the Apache values are stored in the registry.
+ *
+ * If you are looking here to roll the tarball, you didn't need to visit.
+ * registry.c now picks up the version from include/httpd.h
*/
-#define VENDOR "Apache Software Foundation"
-#define SOFTWARE "Apache"
-#define VERSION "2.0a4-dev"
-
-#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
+#define REGKEY "SOFTWARE\\" AP_SERVER_BASEVENDOR "\\" AP_SERVER_BASEPRODUCT "\\" AP_SERVER_BASEREVISION
#define SERVICEKEYPRE "System\\CurrentControlSet\\Services\\"
#define SERVICEKEYPOST "\\Parameters"
1.49 +4 -1 apache-2.0/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- httpd.h 2000/05/27 22:40:20 1.48
+++ httpd.h 2000/05/28 17:52:19 1.49
@@ -278,7 +278,10 @@
#endif
#endif /* CORE_PRIVATE */
-#define AP_SERVER_BASEVERSION "Apache/2.0a4-dev" /* SEE COMMENTS ABOVE */
+#define AP_SERVER_BASEVENDOR "Apache Software Foundation"
+#define AP_SERVER_BASEPRODUCT "Apache"
+#define AP_SERVER_BASEREVISION "2.0a4-dev"
+#define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION
#define AP_SERVER_VERSION AP_SERVER_BASEVERSION
#define AP_SERVER_PROTOCOL "HTTP/1.1"
RE: cvs commit: apache-2.0/src/include httpd.h
Posted by "William A. Rowe, Jr." <wr...@lnd.com>.
> +#define AP_SERVER_BASEVENDOR "Apache Software Foundation"
Vendor is a pretty odd word in this context, if someone has a more
accurate tag name feel free to change this :-)
I don't have the karma to fix the docs on rolling the tarball, so
if someone has the energy please do so.
If noone objects I'll apply the same patch to 1.3.x this coming
week (so change VENDOR by Tuesday eve if you have something better).
Bill
> -----Original Message-----
> From: wrowe@locus.apache.org [mailto:wrowe@locus.apache.org]
> Sent: Sunday, May 28, 2000 12:52 PM
> To: apache-2.0-cvs@apache.org
> Subject: cvs commit: apache-2.0/src/include httpd.h
>
>
> wrowe 00/05/28 10:52:20
>
> Modified: src/os/win32 registry.c
> src/include httpd.h
> Log:
> Remove any possiblity of having multiple tags to correct
> as the version
> changes. Split httpd.h's version into tokens. Roll
> these tokens into
> registry.c
>
> TODO: Remove registry.c from the list of files to touch
> when rolling
>
> Revision Changes Path
> 1.21 +5 -8 apache-2.0/src/os/win32/registry.c
>
> Index: registry.c
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/os/win32/registry.c,v
> retrieving revision 1.20
> retrieving revision 1.21
> diff -u -r1.20 -r1.21
> --- registry.c 2000/05/27 05:27:38 1.20
> +++ registry.c 2000/05/28 17:52:15 1.21
> @@ -87,16 +87,13 @@
> #include "httpd.h"
> #include "http_log.h"
>
> -/* Define where the Apache values are stored in the
> registry. In general
> - * VERSION will be the same across all beta releases for a
> particular
> - * major release, but will change when the final release is made.
> +/* Define where the Apache values are stored in the registry.
> + *
> + * If you are looking here to roll the tarball, you didn't
> need to visit.
> + * registry.c now picks up the version from include/httpd.h
> */
>
> -#define VENDOR "Apache Software Foundation"
> -#define SOFTWARE "Apache"
> -#define VERSION "2.0a4-dev"
> -
> -#define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION
> +#define REGKEY "SOFTWARE\\" AP_SERVER_BASEVENDOR "\\"
> AP_SERVER_BASEPRODUCT "\\" AP_SERVER_BASEREVISION
>
> #define SERVICEKEYPRE "System\\CurrentControlSet\\Services\\"
> #define SERVICEKEYPOST "\\Parameters"
>
>
>
> 1.49 +4 -1 apache-2.0/src/include/httpd.h
>
> Index: httpd.h
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
> retrieving revision 1.48
> retrieving revision 1.49
> diff -u -r1.48 -r1.49
> --- httpd.h 2000/05/27 22:40:20 1.48
> +++ httpd.h 2000/05/28 17:52:19 1.49
> @@ -278,7 +278,10 @@
> #endif
> #endif /* CORE_PRIVATE */
>
> -#define AP_SERVER_BASEVERSION "Apache/2.0a4-dev" /*
> SEE COMMENTS ABOVE */
> +#define AP_SERVER_BASEVENDOR "Apache Software Foundation"
> +#define AP_SERVER_BASEPRODUCT "Apache"
> +#define AP_SERVER_BASEREVISION "2.0a4-dev"
> +#define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/"
> AP_SERVER_BASEREVISION
> #define AP_SERVER_VERSION AP_SERVER_BASEVERSION
>
> #define AP_SERVER_PROTOCOL "HTTP/1.1"
>
>
>
>