From: Takashi Sato <takashi@apache.org>
Date: Thu, 9 Jul 2009 13:45:35 +0000 (+0000)
Subject: vote and comment
X-Git-Tag: 2.2.12~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e3b208c6db3c14afe513beb006849ccd6b7539;p=thirdparty%2Fapache%2Fhttpd.git

vote and comment

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

diff --git a/STATUS b/STATUS
index 7c307c33196..f84d7371a72 100644
--- a/STATUS
+++ b/STATUS
@@ -124,7 +124,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           http://svn.apache.org/viewvc?view=rev&revision=780692
           http://svn.apache.org/viewvc?view=rev&revision=780697
           http://svn.apache.org/viewvc?view=rev&revision=780699
-   +1: niq, rpluem
+   +1: niq, rpluem, takashi
 
  * mod_proxy_http: fix Host: header for literal IPv6 addresses.
    PR 47177
@@ -144,6 +144,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    patch updated: removed font clutter as suggested by niq,
                   added compile-time version output as suggested by wrowe.
    +1: fuankg, wrowe
+   -1: takashi; This doesn't compile because it doesn't include apu_version.h
 
  * unixd: set suexec_enabled correctly when httpd is run by non-root
    PR 42175
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index 9d8495ca47b..06bee4c8a71 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,20 @@ 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);
+#if APR_MAJOR_VERSION < 2
+    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);
+#endif
     ap_rprintf(r,
                "<dt><strong>Module Magic Number:</strong> "
                "<tt>%d:%d</tt></dt>\n", MODULE_MAGIC_NUMBER_MAJOR,