From: Jim Jagielski <jim@apache.org>
Date: Fri, 10 Jul 2009 12:18:07 +0000 (+0000)
Subject: Add APR info to mod_info
X-Git-Tag: 2.2.12~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59b41eeaa4922d041b2e1a661c21ec92b855830c;p=thirdparty%2Fapache%2Fhttpd.git

Add APR info to mod_info


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

diff --git a/STATUS b/STATUS
index 38046f94826..f82731744ae 100644
--- a/STATUS
+++ b/STATUS
@@ -107,14 +107,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    2.2.x patch: http://people.apache.org/~niq/patches/46942.patch
    +1: niq, rpluem, jim
 
- * mod_info: Add apr / apr-util version output
-   trunk patch: http://cvs.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_info.c?r1=792570&r2=760403
-   2.2.x patch: http://people.apache.org/~takashi/patches/2.2-mod_info_apr_version.diff
-   patch updated: removed font clutter as suggested by niq,
-                  added compile-time version output as suggested by wrowe.
-                  Add the missing include of apu_version.h.
-   +1: takashi, rpluem, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index 9d8495ca47b..297953fd0a2 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -44,6 +44,8 @@
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
+#include "apr_version.h"
+#include "apu_version.h"
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
@@ -351,6 +353,18 @@ static int show_server_settings(request_rec * r)
                "<dt><strong>Server Built:</strong> "
                "<font size=\"+1\"><tt>%s</tt></font></dt>\n",
                ap_get_server_built());
+    ap_rprintf(r,
+               "<dt><strong>Server loaded APR Version:</strong> "
+               "<tt>%s</tt></dt>\n", apr_version_string());
+    ap_rprintf(r,
+               "<dt><strong>Compiled with APR Version:</strong> "
+               "<tt>%s</tt></dt>\n", APR_VERSION_STRING);
+    ap_rprintf(r,
+               "<dt><strong>Server loaded APU Version:</strong> "
+               "<tt>%s</tt></dt>\n", apu_version_string());
+    ap_rprintf(r,
+               "<dt><strong>Compiled with APU Version:</strong> "
+               "<tt>%s</tt></dt>\n", APU_VERSION_STRING);
     ap_rprintf(r,
                "<dt><strong>Module Magic Number:</strong> "
                "<tt>%d:%d</tt></dt>\n", MODULE_MAGIC_NUMBER_MAJOR,