Merge r711421 from trunk:

Holey moley. Marcus Burke noted this in Rich's Nuts/Bolts talk.
How embarassing!

Reviewed by: jim

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

diff --git a/STATUS b/STATUS
index 550f5e0eed0a4ec1d076fefde783ac4ab781dd66..419816d9425a85195f976ae9c49fe38fb7f9df90 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -121,13 +121,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         Trunk version of patch works
      +1: rpluem, jim, pgollucci
 
-   * mod_info: Display the *real* keepalive time value.
-     Trunk version of patch:
-        http://svn.apache.org/viewvc?rev=711421&view=rev
-     Backport version for 2.2.x of patch:
-        Trunk version of patch works
-     +1: jim, rpluem, pgollucci
-
 
 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 eb4e0c63761de976188438ffe9e7da0a0dd4ff55..9d8495ca47bc0157136c1537b00f4bd2d1aaa817 100644 (file)
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -364,7 +364,7 @@ static int show_server_settings(request_rec * r)
                "<tt>connection: %d &nbsp;&nbsp; "
                "keep-alive: %d</tt></dt>",
                (int) (apr_time_sec(serv->timeout)),
-               (int) (apr_time_sec(serv->timeout)));
+               (int) (apr_time_sec(serv->keep_alive_timeout)));
     ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons);
     ap_mpm_query(AP_MPMQ_IS_THREADED, &threaded);
     ap_mpm_query(AP_MPMQ_IS_FORKED, &forked);