From: Paul Querna <pquerna@apache.org>
Date: Sat, 1 Apr 2006 06:22:25 +0000 (+0000)
Subject: Merge r390573 from trunk:
X-Git-Tag: 2.2.1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8efebc65b8ac3cb5c2cd2fc332648f0bbf454fc1;p=thirdparty%2Fapache%2Fhttpd.git

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 483e8fde77c..d8d0ba6c6bf 100644
--- 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 50d642702fa..1d8b7061ffb 100644
--- 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 72f79634df6..da0a21b225e 100644
--- 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