Commit 35955da9 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 20891256

STATUS

+0 −7
Changes for STATUS: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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 ]

modules/generators/mod_info.c

+1 −1
Changes for modules/generators/mod_info.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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);