Merge r390573 from trunk:

  With all of the, uhm, interesting manners in which httpd
  can be built and installed, let's ensure httpd -V gives the
  reporter a chance to identify the APR flavor used to compile
  and to run httpd when reporting bugs.

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

diff --git a/CHANGES b/CHANGES
index 483e8fde77ce3a812bb06441dd61d95c16f7116d..d8d0ba6c6bfffc535c9a39327b06e58ea7507e89 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,9 @@ Changes with Apache 2.2.1
      made to 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]
+
   *) http: If a connection is aborted while waiting for a chunked line, 
      flag the connection as errored out.  [Justin Erenkrantz]
 

diff --git a/STATUS b/STATUS
index 50d642702fa6cbbe7f560309c9380b9c999d0b15..1d8b7061ffbc7fbe1aec0085ca8511066c5aba2f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -83,11 +83,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
      +1: rpluem, pquerna, rooneg
 
-   * core httpd -V - display the APR built, and running.
-     http://svn.apache.org/viewcvs?rev=390573&view=rev
-     +1: wrowe, pquerna, rooneg
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init

diff --git a/server/main.c b/server/main.c
index 72f79634df6c6383f6dab9e76d580bedbce08fe3..da0a21b225e2ad1c3ebbeb3751a6e2ee1acdf1ec 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
@@ -90,7 +92,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