Prepare for the tag.

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

diff --git a/CHANGES b/CHANGES
index 141c800fe64a25afc707af379b1d5520b49a7bb2..c19a103fa78383aa97707a86abd3d2f3d7c9a969 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 Changes with Apache 2.0.42
 
-  *) Add -p option to apxs to allow programs to be compiled with apxs.
-     [Justin Erenkrantz]
+  *) mod_dav: Check for versioning hooks before using them.
+     [Greg Stein]
 
 Changes with Apache 2.0.41
 
@@ -33,9 +33,6 @@ Changes with Apache 2.0.41
 
   *) Fix memory leak in core_output_filter.  [Justin Erenkrantz]
 
-  *) Rewrite of aaa modules to an authn/authz model.
-     [Dirk-Willem van Gulik, Justin Erenkrantz]
-  
   *) Update OpenSSL detection to work on Darwin.
      [Sander Temme <sctemme@covalent.net>]
 

diff --git a/include/ap_release.h b/include/ap_release.h
index 373a8045bf9ea72c2a3f47a13aecfa0ba65d0128..3a4014edeaf99c46f76eb3ea9e1e74301dfa1f8a 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -75,7 +75,7 @@
 #define AP_SERVER_BASEPRODUCT "Apache"
 #define AP_SERVER_MAJORVERSION "2"
 #define AP_SERVER_MINORVERSION "0"
-#define AP_SERVER_PATCHLEVEL "42-dev"
+#define AP_SERVER_PATCHLEVEL "42"
 #define AP_SERVER_MINORREVISION AP_SERVER_MAJORVERSION "." AP_SERVER_MINORVERSION
 #define AP_SERVER_BASEREVISION  AP_SERVER_MINORREVISION "." AP_SERVER_PATCHLEVEL
 #define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION