1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

mod_proxy: follow up to r1836588: configurable Proxy100Continue.

Add Proxy100Continue directive to allow for 100-continue forwarding opt-out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1856036 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2019-03-22 09:53:29 +00:00
parent 67ef6b9417
commit 0848891b92
5 changed files with 50 additions and 2 deletions

View File

@@ -1947,6 +1947,7 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
proxy_conn_rec *backend = NULL;
int is_ssl = 0;
conn_rec *c = r->connection;
proxy_dir_conf *dconf;
int retry = 0;
char *locurl = url;
int toclose = 0;
@@ -2007,8 +2008,11 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
req->bucket_alloc = c->bucket_alloc;
req->rb_method = RB_INIT;
dconf = ap_get_module_config(r->per_dir_config, &proxy_module);
/* Should we handle end-to-end or ping 100-continue? */
if (r->expecting_100 || PROXY_DO_100_CONTINUE(worker, r)) {
if ((r->expecting_100 && dconf->forward_100_continue)
|| PROXY_DO_100_CONTINUE(worker, r)) {
/* We need to reset r->expecting_100 or prefetching will cause
* ap_http_filter() to send "100 Continue" response by itself. So
* we'll use req->expecting_100 in mod_proxy_http to determine whether