httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r792909 - in /httpd/httpd/branches/2.2.x: STATUS modules/generators/mod_info.c
Date Fri, 10 Jul 2009 12:18:07 GMT
Author: jim
Date: Fri Jul 10 12:18:07 2009
New Revision: 792909

URL: http://svn.apache.org/viewvc?rev=792909&view=rev
Log:
Add APR info to mod_info

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/generators/mod_info.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=792909&r1=792908&r2=792909&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Jul 10 12:18:07 2009
@@ -107,14 +107,6 @@
    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 ]

Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_info.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_info.c?rev=792909&r1=792908&r2=792909&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_info.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_info.c Fri Jul 10 12:18:07 2009
@@ -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"
 
@@ -352,6 +354,18 @@
                "<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,
                MODULE_MAGIC_NUMBER_MINOR);



Mime
View raw message