Commit 503d7750 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Add the possibility to set a separate connection timeout for backend 

  workers.

PR: 45445
Submitted by: rahul <rahul sun.com>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@684341 13f79535-47bb-0310-9956-ffa450edef68
parent c2efef5f

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
Changes with Apache 2.3.0

[ When backported to 2.2.x, remove entry from this file ]



  *) mod_proxy: Add connectiontimeout parameter for proxy workers in order to

     be able to set the timeout for connecting to the backend separately.

     PR 45445. [Ruediger Pluem, rahul <rahul sun.com>]



  *) mod_dav_fs: Retrieve minimal system information about directory 

     entries when walking a DAV fs, resolving a performance degradation on 

     Windows.  PR 45464.  [Jeff Trawick]

docs/manual/mod/mod_proxy.xml

+6 −0
Changes for docs/manual/mod/mod_proxy.xml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -697,6 +697,12 @@ expressions</description> 
    connections in the pool the Apache will return <code>SERVER_BUSY</code>

    status to the client.

    </td></tr>

    <tr><td>connectiontimeout</td>

        <td>timeout</td>

        <td>Connect timeout in seconds.

        The number of seconds Apache waits for the creation of a connection to

        the backend to complete.

    </td></tr>

    <tr><td>disablereuse</td>

        <td>Off</td>

        <td>This parameter should be used when you want to force mod_proxy

include/ap_mmn.h

+4 −1
Changes for include/ap_mmn.h: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ 
 *                         Rationale: see r661069.

 * 20080528.1 (2.3.0-dev)  add has_realm_hash() to authn_provider struct

 * 20080722.0 (2.3.0-dev)  remove has_realm_hash() from authn_provider struct

 * 20080722.1 (2.3.0-dev)  Add conn_timeout and conn_timeout_set to

 *                         proxy_worker struct.

 *

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -170,7 +173,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20080722

#endif

#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

modules/proxy/mod_proxy.c

+10 −0
Changes for modules/proxy/mod_proxy.c: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -281,6 +281,16 @@ static const char *set_worker_param(apr_pool_t *p, 
            return "lbset must be between 0 and 99";

        worker->lbset = ival;

    }

    else if (!strcasecmp(key, "connectiontimeout")) {

        /* Request timeout in seconds.

         * Defaults to connection timeout

         */

        ival = atoi(val);

        if (ival < 1)

            return "Connectiontimeout must be at least one second.";

        worker->conn_timeout = apr_time_from_sec(ival);

        worker->conn_timeout_set = 1;

    }

    else {

        return "unknown Worker parameter";

    }

modules/proxy/mod_proxy.h

+2 −0
Changes for modules/proxy/mod_proxy.h: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -352,6 +352,8 @@ struct proxy_worker { 
    char            retry_set;

    char            disablereuse;

    char            disablereuse_set;

    apr_interval_time_t conn_timeout;

    char            conn_timeout_set;

};



/*