You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Yann Ylavic <yl...@gmail.com> on 2018/02/15 13:42:52 UTC
Re: svn commit: r1824306 - /httpd/httpd/patches/2.4.x/balancer-slotmem-selection.diff
On Thu, Feb 15, 2018 at 2:34 PM, <ic...@apache.org> wrote:
>
> +Index: modules/proxy/mod_proxy.h
> +===================================================================
> +--- modules/proxy/mod_proxy.h (revision 1824303)
> ++++ modules/proxy/mod_proxy.h (working copy)
> +@@ -494,6 +494,11 @@
> + unsigned int inactive:1;
> + unsigned int forcerecovery:1;
> + char sticky_separator; /* separator for sessionid/route */
> ++ unsigned int forcerecovery_set:1;
> ++ unsigned int scolonsep_set:1;
> ++ unsigned int sticky_force_set:1;
> ++ unsigned int nonce_set:1;
> ++ unsigned int sticky_separator_set:1;
> + } proxy_balancer_shared;
> +
> + #define ALIGNED_PROXY_BALANCER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_balancer_shared)))
> +@@ -514,6 +519,9 @@
> + void *context; /* general purpose storage */
> + proxy_balancer_shared *s; /* Shared data */
> + int failontimeout; /* Whether to mark a member in Err if IO timeout occurs */
> ++ unsigned int failontimeout_set:1;
> ++ unsigned int growth_set:1;
> ++ unsigned int lbmethod_set:1;
> + ap_conf_vector_t *section_config; /* <Proxy>-section wherein defined */
> + };
New fields need to go last.
Though possibly it's not really relevent here since section_config is
also new to 2.4.30, maybe we should stay aligned with trunk.
Yeah, actually I prefer like this, it could have been so if we
backported this one before :)
Re: svn commit: r1824306 -
/httpd/httpd/patches/2.4.x/balancer-slotmem-selection.diff
Posted by Stefan Eissing <st...@greenbytes.de>.
I'm innocent! I made the order the same as trunk! (I think the other field has not been released, right?)
> Am 15.02.2018 um 14:42 schrieb Yann Ylavic <yl...@gmail.com>:
>
> On Thu, Feb 15, 2018 at 2:34 PM, <ic...@apache.org> wrote:
>>
>> +Index: modules/proxy/mod_proxy.h
>> +===================================================================
>> +--- modules/proxy/mod_proxy.h (revision 1824303)
>> ++++ modules/proxy/mod_proxy.h (working copy)
>> +@@ -494,6 +494,11 @@
>> + unsigned int inactive:1;
>> + unsigned int forcerecovery:1;
>> + char sticky_separator; /* separator for sessionid/route */
>> ++ unsigned int forcerecovery_set:1;
>> ++ unsigned int scolonsep_set:1;
>> ++ unsigned int sticky_force_set:1;
>> ++ unsigned int nonce_set:1;
>> ++ unsigned int sticky_separator_set:1;
>> + } proxy_balancer_shared;
>> +
>> + #define ALIGNED_PROXY_BALANCER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_balancer_shared)))
>> +@@ -514,6 +519,9 @@
>> + void *context; /* general purpose storage */
>> + proxy_balancer_shared *s; /* Shared data */
>> + int failontimeout; /* Whether to mark a member in Err if IO timeout occurs */
>> ++ unsigned int failontimeout_set:1;
>> ++ unsigned int growth_set:1;
>> ++ unsigned int lbmethod_set:1;
>> + ap_conf_vector_t *section_config; /* <Proxy>-section wherein defined */
>> + };
>
> New fields need to go last.
> Though possibly it's not really relevent here since section_config is
> also new to 2.4.30, maybe we should stay aligned with trunk.
> Yeah, actually I prefer like this, it could have been so if we
> backported this one before :)