Merge r607873 from trunk:

Modified default refresh value to 10 secs so that its possible to correct a typo.

Submitted by: fuankg
Reviewed by: fuankg, rpluem, wrowe

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

diff --git a/STATUS b/STATUS
index 1cdfae398ad27b14a37b3f91f38f8f1a01980f49..68a66f4684b5236752ca3279559cba4c6917ba96 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -107,13 +107,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_status: Modified default refresh value to 10 secs so that its possible
-                 to correct a typo in the URL.
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=607873
-      Trunk version should apply to 2.2.x.
-      +1: fuankg, rpluem, wrowe
-
    * mod_proxy_balancer: Correctly escape the worker route and the worker
      redirect string in the HTML output of the balancer manager.
      Trunk version of patch:

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 691dd075c1f93f76ed7e411ec873af536afeefb1..bcf9b10c4ac63c6534b0df6e0168e2a507cd3a9b 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -306,7 +306,7 @@ static int status_handler(request_rec *r)
                     }
                     apr_table_set(r->headers_out,
                                   status_options[i].hdr_out_str,
-                                  apr_ltoa(r->pool, t < 1 ? 1 : t));
+                                  apr_ltoa(r->pool, t < 1 ? 10 : t));
                     break;
                 }
                 case STAT_OPT_NOTABLE: