You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2012/03/19 14:53:29 UTC
svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy.c
Author: rpluem
Date: Mon Mar 19 13:53:28 2012
New Revision: 1302444
URL: http://svn.apache.org/viewvc?rev=1302444&view=rev
Log:
* Correctly save the reverse proxy worker in all virtual host proxy configs.
PR: 52935
Obtained from: Petter Berntsen <petterb gmail.com>
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1302444&r1=1302443&r2=1302444&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Mar 19 13:53:28 2012
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) mod_proxy: Correctly set up reverse proxy worker. PR 52935.
+ [Petter Berntsen <petterb gmail.com>]
+
*) core: Add filesystem paths to access denied / access failed messages
AH00035 and AH00036. [Eric Covener]
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1302444&r1=1302443&r2=1302444&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Mon Mar 19 13:53:28 2012
@@ -2461,11 +2461,11 @@ static void child_init(apr_pool_t *p, se
ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_FNV);
/* Do not disable worker in case of errors */
reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;
- conf->reverse = reverse;
ap_proxy_initialize_worker(conf->reverse, s, conf->pool);
/* Disable address cache for generic reverse worker */
reverse->s->is_address_reusable = 0;
}
+ conf->reverse = reverse;
s = s->next;
}
}
RE: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy.c
Posted by Plüm,
Rüdiger,
Vodafone Group <ru...@vodafone.com>.
> -----Original Message-----
> From: Jim Jagielski > Sent: Montag, 19. März 2012 20:16
> To: dev@httpd.apache.org
> Subject: Re: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES
> modules/proxy/mod_proxy.c
>
> Cool.. Are these candidates for 2.4.x?
Yes, but currently ENOTIME for backport proposals. So if you want...
Regards
Rüdiger
Re: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
Cool.. Are these candidates for 2.4.x?
On Mar 19, 2012, at 10:55 AM, Plüm, Rüdiger, VF-Group wrote:
>
>
>> -----Original Message-----
>> From: Jim Jagielski [mailto:jim@jaguNET.com]
>> Sent: Montag, 19. März 2012 15:31
>> To: dev@httpd.apache.org
>> Subject: Re: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES
>> modules/proxy/mod_proxy.c
>>
>>
>> On Mar 19, 2012, at 9:53 AM, rpluem@apache.org wrote:
>>> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
>>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.
>> c?rev=1302444&r1=1302443&r2=1302444&view=diff
>>>
>> =======================================================================
>> =======
>>> --- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
>>> +++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Mon Mar 19 13:53:28
>> 2012
>>> @@ -2461,11 +2461,11 @@ static void child_init(apr_pool_t *p, se
>>> ap_proxy_hashfunc(reverse->s->name,
>> PROXY_HASHFUNC_FNV);
>>> /* Do not disable worker in case of errors */
>>> reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;
>>> - conf->reverse = reverse;
>>> ap_proxy_initialize_worker(conf->reverse, s, conf->pool);
>>> /* Disable address cache for generic reverse worker */
>>> reverse->s->is_address_reusable = 0;
>>> }
>>> + conf->reverse = reverse;
>>> s = s->next;
>>> }
>>> }
>>>
>>
>> Is that right? Doesn't that mean that the ap_proxy_initialize_worker()
>> call gets an unknown/undefined 1st arg (conf->reverse)??
>
> Yes :-). The original reporter already pointed that out. Fixed in r1302483.
>
> Regards
>
> Rüdiger
>
RE: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy.c
Posted by Plüm,
Rüdiger,
VF-Group <ru...@vodafone.com>.
> -----Original Message-----
> From: Jim Jagielski [mailto:jim@jaguNET.com]
> Sent: Montag, 19. März 2012 15:31
> To: dev@httpd.apache.org
> Subject: Re: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES
> modules/proxy/mod_proxy.c
>
>
> On Mar 19, 2012, at 9:53 AM, rpluem@apache.org wrote:
> > Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
> > URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.
> c?rev=1302444&r1=1302443&r2=1302444&view=diff
> >
> =======================================================================
> =======
> > --- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
> > +++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Mon Mar 19 13:53:28
> 2012
> > @@ -2461,11 +2461,11 @@ static void child_init(apr_pool_t *p, se
> > ap_proxy_hashfunc(reverse->s->name,
> PROXY_HASHFUNC_FNV);
> > /* Do not disable worker in case of errors */
> > reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;
> > - conf->reverse = reverse;
> > ap_proxy_initialize_worker(conf->reverse, s, conf->pool);
> > /* Disable address cache for generic reverse worker */
> > reverse->s->is_address_reusable = 0;
> > }
> > + conf->reverse = reverse;
> > s = s->next;
> > }
> > }
> >
>
> Is that right? Doesn't that mean that the ap_proxy_initialize_worker()
> call gets an unknown/undefined 1st arg (conf->reverse)??
Yes :-). The original reporter already pointed that out. Fixed in r1302483.
Regards
Rüdiger
Re: svn commit: r1302444 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Mar 19, 2012, at 9:53 AM, rpluem@apache.org wrote:
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1302444&r1=1302443&r2=1302444&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Mon Mar 19 13:53:28 2012
> @@ -2461,11 +2461,11 @@ static void child_init(apr_pool_t *p, se
> ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_FNV);
> /* Do not disable worker in case of errors */
> reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;
> - conf->reverse = reverse;
> ap_proxy_initialize_worker(conf->reverse, s, conf->pool);
> /* Disable address cache for generic reverse worker */
> reverse->s->is_address_reusable = 0;
> }
> + conf->reverse = reverse;
> s = s->next;
> }
> }
>
Is that right? Doesn't that mean that the ap_proxy_initialize_worker()
call gets an unknown/undefined 1st arg (conf->reverse)??