Attachment 22921 Details for Bug 46275 – against trunk

[patch] against trunk

keepalivetimeout_in_ms.patch (text/plain), 1.78 KB, created by Takashi Sato on 2008-11-24 05:25:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Sato

Created: 2008-11-24 05:25:44 UTC

Size: 1.78 KB

patch

obsolete

>Index: docs/manual/mod/core.xml
>===================================================================
>--- docs/manual/mod/core.xml	(revision 714056)
>+++ docs/manual/mod/core.xml	(working copy)
>@@ -1557,14 +1557,15 @@
> <name>KeepAliveTimeout</name>
> <description>Amount of time the server will wait for subsequent
> requests on a persistent connection</description>
>-<syntax>KeepAliveTimeout <var>seconds</var></syntax>
>+<syntax>KeepAliveTimeout <var>num</var>[ms]</syntax>
> <default>KeepAliveTimeout 5</default>
> <contextlist><context>server config</context><context>virtual host</context>
> </contextlist>
> 
> <usage>
>     <p>The number of seconds Apache will wait for a subsequent
>-    request before closing the connection. Once a request has been
>+    request before closing the connection. By adding a postfix of ms the
>+    timeout can be also set in milliseconds. Once a request has been
>     received, the timeout value specified by the
>     <directive module="core">Timeout</directive> directive applies.</p>
> 
>Index: modules/http/http_core.c
>===================================================================
>--- modules/http/http_core.c	(revision 714056)
>+++ modules/http/http_core.c	(working copy)
>@@ -47,12 +47,18 @@
> static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy,
>                                           const char *arg)
> {
>+    apr_interval_time_t timeout;
>     const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE);
>     if (err != NULL) {
>         return err;
>     }
> 
>-    cmd->server->keep_alive_timeout = apr_time_from_sec(atoi(arg));
>+    /* Stolen from mod_proxy.c */
>+    if (ap_timeout_parameter_parse(arg, &timeout, "s") != APR_SUCCESS)
>+        return "KeepAliveTimeout has wrong format";
>+    cmd->server->keep_alive_timeout = timeout;
>     return NULL;
> }
>

Actions: View | Diff

Attachments on bug 46275: 22921