Get ready to tag 2.4.18

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1718692 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index dc3a215c9c8d8a5c7518bcb84d8403b48e012ba1..ef9a38bc9751aaa9767c12d4a82ae57b2466cd55 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,9 @@
 
 Changes with Apache 2.4.18
 
-   *) mod_ssl: for all ssl_engine_vars.c lookups, fall back to master connection
-      if conn_rec itself holds no valid SSLConnRec*. Fixes PR58666.
-      [Stefan Eissing]
-
+  *) mod_ssl: for all ssl_engine_vars.c lookups, fall back to master connection
+     if conn_rec itself holds no valid SSLConnRec*. Fixes PR58666.
+     [Stefan Eissing]
 
   *) mod_http2: connection level window for flow control is set to protocol
      maximum of 2GB-1, preventing window exhaustion when sending data on many

diff --git a/STATUS b/STATUS
index 846c358eb843106bdd6e536d9e6dbe9cfd79afa8..b0e6b448c7841680a55024b8cde3464b35112c1e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -34,7 +34,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
-    2.4.18  : In development.
+    2.4.18  : Tagged on December 8, 2015.
     2.4.17  : Tagged on October 9, 2015. Released October 13, 2015.
     2.4.16  : Tagged on July 9, 2015. Released July 15, 2015
     2.4.15  : Tagged on June 19, 2015. Not released.

diff --git a/include/ap_release.h b/include/ap_release.h
index f7785bba2837e705fd0efcb9592fcd3e652ea46f..79eeee39c7529f2ecd4e784affd5f7a0e343ec67 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -44,7 +44,7 @@
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
 #define AP_SERVER_PATCHLEVEL_NUMBER   18
-#define AP_SERVER_DEVBUILD_BOOLEAN    1
+#define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 /* Synchronize the above with docs/manual/style/version.ent */