PR:

Obtained from:
Submitted by:
Reviewed by:

  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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85338 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/httpd.h b/include/httpd.h
index 67453b41e9058ad36c4f9c9d3e4a40cc4aa4861b..6b44d534508d2cffc557ca581e3c7d2e5d6cc37d 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -278,7 +278,10 @@ extern "C" {
 #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"

diff --git a/server/mpm/winnt/registry.c b/server/mpm/winnt/registry.c
index f3e842c44e0c760a0bb4e31c387e3c60ee8e78ea..bcca09d91ada20ed3696a1e9181604e393b7ea7e 100644 (file)
--- a/server/mpm/winnt/registry.c
+++ b/server/mpm/winnt/registry.c
@@ -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"