Commit d7b7d160 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

* mod_proxy: Add the possibility to set the worker parameters 

     connectiontimeout and ping in milliseconds. 
     Trunk version of patch:
       http://svn.apache.org/viewvc?rev=705005&view=rev
       http://svn.apache.org/viewvc?rev=707022&view=rev
     Backport version for 2.2.x of patch:
       http://people.apache.org/~rpluem/patches/milli_seconds.diff
     +1: rpluem, pgollucci, jim



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

CHANGES

+5 −0
Changes for CHANGES: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ Changes with Apache 2.2.11 
     send the empty body packet, so container can deal with

     that. [Mladen Turk]



  *) core: Add ap_timeout_parameter_parse to public API. [Ruediger Pluem]



  *) mod_proxy: Add the possibility to set the worker parameters

     connectiontimeout and ping in milliseconds. [Ruediger Pluem]



  *) Worker MPM: Crosscheck that idle workers are still available before using

     them and thus preventing an overflow of the worker queue which causes

     a SegFault. PR 45605 [Denis Ustimenko <denusk gmail.com>]

STATUS

+0 −9
Changes for STATUS: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -96,15 +96,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
        http://people.apache.org/~rpluem/patches/proxy_alloc_lifetime_rework_2.2.x.diff

     +1: rpluem, pgollucci, jim



   * mod_proxy: Add the possibility to set the worker parameters

     connectiontimeout and ping in milliseconds. 

     Trunk version of patch:

        http://svn.apache.org/viewvc?rev=705005&view=rev

        http://svn.apache.org/viewvc?rev=707022&view=rev

     Backport version for 2.2.x of patch:

        http://people.apache.org/~rpluem/patches/milli_seconds.diff

     +1: rpluem, pgollucci, jim





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

docs/manual/mod/mod_proxy.xml

+4 −1
Changes for docs/manual/mod/mod_proxy.xml: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -693,7 +693,8 @@ expressions</description> 
        <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.

        the backend to complete. By adding a postfix of ms the timeout can be

        also set in milliseconds.

    </td></tr>

    <tr><td>disablereuse</td>

        <td>Off</td>
@@ -748,6 +749,8 @@ expressions</description> 
        which could be an issue, but it will lower the

        traffic in case some of the cluster nodes are down or busy.

        Currently this has an effect only for AJP.

        By adding a postfix of ms the delay can be also set in

        milliseconds.

    </td></tr>

    <tr><td>loadfactor</td>

        <td>1</td>

include/ap_mmn.h

+2 −1
Changes for include/ap_mmn.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ 
 *                      proxy_worker struct.

 * 20051115.17 (2.2.10) Add scolonsep to proxy_balancer

 * 20051115.18 (2.2.10) Add chroot support to unixd_config

 * 20051115.19 (2.2.11) Added ap_timeout_parameter_parse to util.c / httpd.h

 */



#define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */
@@ -139,7 +140,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20051115

#endif

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

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



/**

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

include/httpd.h

+23 −0
Changes for include/httpd.h: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1734,6 +1734,29 @@ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring); 
AP_DECLARE(char *) ap_append_pid(apr_pool_t *p, const char *string,

                                 const char *delim);



/**

 * Parse a given timeout parameter string into an apr_interval_time_t value.

 * The unit of the time interval is given as postfix string to the numeric

 * string. Currently the following units are understood:

 *

 * ms    : milliseconds

 * s     : seconds

 * mi[n] : minutes

 * h     : hours

 *

 * If no unit is contained in the given timeout parameter the default_time_unit

 * will be used instead.

 * @param timeout_parameter The string containing the timeout parameter.

 * @param timeout The timeout value to be returned.

 * @param default_time_unit The default time unit to use if none is specified

 * in timeout_parameter.

 * @return Status value indicating whether the parsing was successful or not.

 */

AP_DECLARE(apr_status_t) ap_timeout_parameter_parse(

                                               const char *timeout_parameter,

                                               apr_interval_time_t *timeout,

                                               const char *default_time_unit);



/* Misc system hackery */

/**

 * Given the name of an object in the file system determine if it is a directory