Re: svn commit: r1836648 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/proxy/mod_proxy_http.c modules/proxy/proxy_util.c

[Christophe JAILLET]

Le 25/07/2018 à 18:33, yla...@apache.org a écrit :

Author: ylavic
Date: Wed Jul 25 16:33:44 2018
New Revision: 1836648

URL: http://svn.apache.org/viewvc?rev=1836648&view=rev
Log:
mod_proxy_http: follow up to r1836588: avoid 100-continue responses from core.

When mod_proxy_http handles end-to-end "100 continue", it can't let
ap_http_filter() send its own interim response whenever the body is read.

So save/restore r->expecting_100 before/after handling the request, and use
req->expecting_100 internally (including to restore r->expecting appropriately).

While at it, add comments and debug logs about 100 continue handling, and
fill in missing APLOGNO()s from r1836588.

Modified:
 httpd/httpd/trunk/docs/log-message-tags/next-number
 httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
 httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1836648&r1=1836647&r2=1836648&view=diff
==
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Wed Jul 25 16:33:44 2018
@@ -1 +1 @@
-10153
+10155

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=1836648&r1=1836647&r2=1836648&view=diff
==
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Wed Jul 25 16:33:44 2018
@@ -254,6 +254,7 @@ typedef struct {
  apr_off_t cl_val, bytes_spooled;
  
  int do_100_continue;

+int expecting_100;
  int flushall;
  } proxy_http_req_t;

unsigned int bitfield for these 3 variables?

CJ

AW: AW: Current trunk win build error

[Plüm , Rüdiger , Vodafone Group]

Can you try again with latest trunk including r1836613? This should make [2] 
obsolete.

Regards

Rüdiger

> -Ursprüngliche Nachricht-
> Von: Michal Karm 
> Gesendet: Mittwoch, 25. Juli 2018 10:28
> An: dev@httpd.apache.org; Plüm, Rüdiger, Vodafone Group
> 
> Betreff: Re: AW: Current trunk win build error
> 
> On 07/25/2018 08:24 AM, Plüm, Rüdiger, Vodafone Group wrote:
> >
> > r1836603
> >
> >
> >
> > @Windows folks: Can you please try if trunk mod_proxy builds again on
> Windows?
> >
> >
> >
> 
> I've never thought I would be replying to a call to Windows folks, but
> here I go:
> 
> It builds just fine on Windows with my particular CMake based setup [1],
> with
> this h2 patch still needed [2], because [3] is not pushed to trunk.
> The build completes just fine, the Jenkins job fails on seeing errors in
> the
> error_log during smoke test, reported as [ASF BZ 62567].
> 
> 
> From an email from Jenkins:
> 
> > See  windows/label=w2k12r2/21/display/redirect?page=changes>
> >
> > Changes:
> >
> > [ylavic] mod_proxy_http: forward 100-continue.
> >
> > [rpluem] * ap_proxy_balancer_get_best_worker cannot be exported and
> used as an
> >
> > --
> > [...truncated 1.39 MB...]
> > [Wed Jul 25 01:08:10.845360 2018] [core:error] [pid 3772:tid 3652]
> [client ::1:56189] AH00082: an unknown filter was not added:
> >
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
> > [Wed Jul 25 01:08:10.848257 2018] [core:error] [pid 3772:tid 3652]
> [client ::1:56189] AH00082: an unknown filter was not added:
> >
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
> > [Wed Jul 25 01:08:10.851255 2018] [core:error] [pid 3772:tid 3652]
> [client ::1:56189] AH00082: an unknown filter was not added:
> >
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
> > [Wed Jul 25 01:08:10.854078 2018] [core:error] [pid 3772:tid 3652]
> [client ::1:56189] AH00082: an unknown filter was not added:
> >
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
> 
> 
> Cheers
> Karm
> 
> [1]
> https://github.com/modcluster/ci.modcluster.io/blob/master/windows/httpd
> /build.bat
> [2]
> https://raw.githubusercontent.com/modcluster/ci.modcluster.io/master/win
> dows/httpd/httpd-trunk_CMakeLists.txt.patch
> [3]
> https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CMakeLists.txt?
> r1=1832855&r2=1832854&pathrev=1832855
> [ASF BZ 62567] https://bz.apache.org/bugzilla/show_bug.cgi?id=62567
> 
> 
> > Regards
> >
> >
> >
> > Rüdiger
> >
> >
> >
> > *Von:*William A Rowe Jr 
> > *Gesendet:* Dienstag, 24. Juli 2018 18:16
> > *An:* httpd 
> > *Betreff:* Re: Current trunk win build error
> >
> >
> >
> > +1, looks great.
> >
> >
> >
> 
> 
> Michal Karm Babacek
> 
> --
> Sent from my Hosaka Ono-Sendai Cyberspace 7
> 

Re: AW: Current trunk win build error

[Michal Karm]

On 07/25/2018 08:24 AM, Plüm, Rüdiger, Vodafone Group wrote:
>
> r1836603
>
>  
>
> @Windows folks: Can you please try if trunk mod_proxy builds again on Windows?
>
>  
>

I've never thought I would be replying to a call to Windows folks, but here I 
go:

It builds just fine on Windows with my particular CMake based setup [1], with
this h2 patch still needed [2], because [3] is not pushed to trunk.
The build completes just fine, the Jenkins job fails on seeing errors in the
error_log during smoke test, reported as [ASF BZ 62567].


From an email from Jenkins:

> See 
> 
> 
> Changes:
> 
> [ylavic] mod_proxy_http: forward 100-continue.
> 
> [rpluem] * ap_proxy_balancer_get_best_worker cannot be exported and used as an
> 
> --
> [...truncated 1.39 MB...]
> [Wed Jul 25 01:08:10.845360 2018] [core:error] [pid 3772:tid 3652] [client 
> ::1:56189] AH00082: an unknown filter was not added:
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLICY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
> [Wed Jul 25 01:08:10.848257 2018] [core:error] [pid 3772:tid 3652] [client 
> ::1:56189] AH00082: an unknown filter was not added: 
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLICY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
> [Wed Jul 25 01:08:10.851255 2018] [core:error] [pid 3772:tid 3652] [client 
> ::1:56189] AH00082: an unknown filter was not added: 
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLICY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
> [Wed Jul 25 01:08:10.854078 2018] [core:error] [pid 3772:tid 3652] [client 
> ::1:56189] AH00082: an unknown filter was not added: 
> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLICY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE


Cheers
Karm

[1]
https://github.com/modcluster/ci.modcluster.io/blob/master/windows/httpd/build.bat
[2]
https://raw.githubusercontent.com/modcluster/ci.modcluster.io/master/windows/httpd/httpd-trunk_CMakeLists.txt.patch
[3]
https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CMakeLists.txt?r1=1832855&r2=1832854&pathrev=1832855
[ASF BZ 62567] https://bz.apache.org/bugzilla/show_bug.cgi?id=62567


> Regards
>
>  
>
> Rüdiger
>
>  
>
> *Von:*William A Rowe Jr 
> *Gesendet:* Dienstag, 24. Juli 2018 18:16
> *An:* httpd 
> *Betreff:* Re: Current trunk win build error
>
>  
>
> +1, looks great.
>
>  
>


Michal Karm Babacek

-- 
Sent from my Hosaka Ono-Sendai Cyberspace 7

Re: AW: AW: Current trunk win build error

[Michal Karm]

On 07/25/2018 10:56 AM, Plüm, Rüdiger, Vodafone Group wrote:
> Can you try again with latest trunk including r1836613? This should make [2] 
> obsolete.

Thank you. I can confirm that [2] is not needed any more.

Changes:
[rpluem] * Forward port r1832855 missing in trunk.

>
> Regards
>
> Rüdiger
>
>> -Ursprüngliche Nachricht-
>> Von: Michal Karm 
>> Gesendet: Mittwoch, 25. Juli 2018 10:28
>> An: dev@httpd.apache.org; Plüm, Rüdiger, Vodafone Group
>> 
>> Betreff: Re: AW: Current trunk win build error
>>
>> On 07/25/2018 08:24 AM, Plüm, Rüdiger, Vodafone Group wrote:
>>> r1836603
>>>
>>>
>>>
>>> @Windows folks: Can you please try if trunk mod_proxy builds again on
>> Windows?
>>>
>>>
>> I've never thought I would be replying to a call to Windows folks, but
>> here I go:
>>
>> It builds just fine on Windows with my particular CMake based setup [1],
>> with
>> this h2 patch still needed [2], because [3] is not pushed to trunk.
>> The build completes just fine, the Jenkins job fails on seeing errors in
>> the
>> error_log during smoke test, reported as [ASF BZ 62567].
>>
>>
>> From an email from Jenkins:
>>
>>> See > windows/label=w2k12r2/21/display/redirect?page=changes>
>>> Changes:
>>>
>>> [ylavic] mod_proxy_http: forward 100-continue.
>>>
>>> [rpluem] * ap_proxy_balancer_get_best_worker cannot be exported and
>> used as an
>>> --
>>> [...truncated 1.39 MB...]
>>> [Wed Jul 25 01:08:10.845360 2018] [core:error] [pid 3772:tid 3652]
>> [client ::1:56189] AH00082: an unknown filter was not added:
>> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
>> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
>>> [Wed Jul 25 01:08:10.848257 2018] [core:error] [pid 3772:tid 3652]
>> [client ::1:56189] AH00082: an unknown filter was not added:
>> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
>> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
>>> [Wed Jul 25 01:08:10.851255 2018] [core:error] [pid 3772:tid 3652]
>> [client ::1:56189] AH00082: an unknown filter was not added:
>> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
>> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
>>> [Wed Jul 25 01:08:10.854078 2018] [core:error] [pid 3772:tid 3652]
>> [client ::1:56189] AH00082: an unknown filter was not added:
>> POLICY_TYPEPOLICY_LENGTHPOLICY_KEEPALIVEPOLICY_VARYPOLICY_VALIDATIONPOLI
>> CY_CONDITIONALPOLICY_NOCACHEPOLICY_MAXAGE
>>
>>
>> Cheers
>> Karm
>>
>> [1]
>> https://github.com/modcluster/ci.modcluster.io/blob/master/windows/httpd
>> /build.bat
>> [2]
>> https://raw.githubusercontent.com/modcluster/ci.modcluster.io/master/win
>> dows/httpd/httpd-trunk_CMakeLists.txt.patch
>> [3]
>> https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CMakeLists.txt?
>> r1=1832855&r2=1832854&pathrev=1832855
>> [ASF BZ 62567] https://bz.apache.org/bugzilla/show_bug.cgi?id=62567
>>
>>
>>> Regards
>>>
>>>
>>>
>>> Rüdiger
>>>
>>>
>>>
>>> *Von:*William A Rowe Jr 
>>> *Gesendet:* Dienstag, 24. Juli 2018 18:16
>>> *An:* httpd 
>>> *Betreff:* Re: Current trunk win build error
>>>
>>>
>>>
>>> +1, looks great.
>>>
>>>
>>>
>>
>> Michal Karm Babacek
>>
>> --
>> Sent from my Hosaka Ono-Sendai Cyberspace 7
>>


Michal Karm Babacek

-- 
Sent from my Hosaka Ono-Sendai Cyberspace 7