git.net

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


Le 25/07/2018 à 18:33, ylavic@xxxxxxxxxx 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




( ! ) Warning: include(msgfooter.php): failed to open stream: No such file or directory in /var/www/git/apache2-developers/msg04380.html on line 121
Call Stack
#TimeMemoryFunctionLocation
10.0007358376{main}( ).../msg04380.html:0

( ! ) Warning: include(): Failed opening 'msgfooter.php' for inclusion (include_path='.:/var/www/git') in /var/www/git/apache2-developers/msg04380.html on line 121
Call Stack
#TimeMemoryFunctionLocation
10.0007358376{main}( ).../msg04380.html:0