Backport httpd -V status display of compiled/loaded apr[-util] versions.

Backports: 390573

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

diff --git a/CHANGES b/CHANGES
index 506d8ff67df2f08698183289215961bbd8f7466b..19c3f7646a3c76d2958eddfad6c51df74dc42d70 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,9 @@ Changes with Apache 2.0.56
      ap_escape_html so we escape quotes.  Reported by JPCERT.
      [Mark Cox]
 
+  *) Add APR/APR-Util Compiled and Runtime Version numbers to the
+     output of 'httpd -V'. [William Rowe]
+
   *) Ensure that the proper status line is written to the client, fixing
      incorrect status lines caused by filters which modify r->status without 
      resetting r->status_line, such as the built-in byterange filter.

diff --git a/STATUS b/STATUS
index b58acdc137adacdd0acfc713a0b4d1e3de15df0b..ab3b5708cae0fdf93b4d4b93f120562182f7a78a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,9 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    *) core httpd -V - display the APR built, and running.
-       http://svn.apache.org/viewcvs?rev=390573&view=rev
-       +1: wrowe, trawick, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
@@ -126,6 +123,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~colm/httpd-2.0-reverse-proxy-cookie.patch
         and is in production with Clients.
        +1: niq
+       +0: looks good, but there's no way to apply this without a minor bump
 
     *) mod_cgid: Fix PR 36410. Invoke the set_suexec_identity hook from
        the non-cgid side of the handler, where the full per-server/dir/etc

diff --git a/server/main.c b/server/main.c
index 6bec08f1f9e72877c671e8718f5c1d4afe1e28c9..608082a9245d44e9dd9163c9e122361e7820df25 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -20,6 +20,8 @@
 #include "apr_general.h"
 #include "apr_lib.h"
 #include "apr_md5.h"
+#include "apr_version.h"
+#include "apu_version.h"
 
 #define APR_WANT_STDIO
 #define APR_WANT_STRFUNC
@@ -50,7 +52,10 @@ static void show_compile_settings(void)
     printf("Server built:   %s\n", ap_get_server_built());
     printf("Server's Module Magic Number: %u:%u\n",
            MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
-
+    printf("Server loaded:  APR %s, APR-UTIL %s\n",
+           apr_version_string(), apu_version_string());
+    printf("Compiled using: APR %s, APR-UTIL %s\n",
+           APR_VERSION_STRING, APU_VERSION_STRING);
     /* sizeof(foo) is long on some platforms so we might as well
      * make it long everywhere to keep the printf format
      * consistent