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

mod_proxy_http: Avoid 417 responses for non forwardable 100-continue. PR 65666.

Browse Source 
Stop returning 417 when mod_proxy has to forward an HTTP/1.1 request with both
"Expect: 100-continue" and "force-proxy-request-1.0" set, mod_proxy can instead
handle the 100-continue by itself before forwarding the request, like in the
"Proxy100Continue Off" case.

Note that this does not change the behaviour of httpd receiving an HTTP/1.0
request with an Expect header, ap_check_request_header() will still correctly
return 417 in this case.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1901420 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2022-05-30 15:54:34 +00:00
parent f4230a5e7d
commit 9a8214d08f
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
modules/proxy/proxy_util.c
View File

@@ -3891,9 +3891,9 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
char *buf;
apr_table_t *saved_headers_in, *request_headers;
apr_bucket *e;
int do_100_continue;
int force10 = 0, ping100 = 0;
conn_rec *origin = p_conn->connection;
const char *fpr1, *creds;
const char *creds;
proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config, &proxy_module);
/*
@@ -3901,29 +3901,25 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
* To be compliant, we only use 100-Continue for requests with bodies.
* We also make sure we won't be talking HTTP/1.0 as well.
*/
fpr1 = apr_table_get(r->subprocess_env, "force-proxy-request-1.0");
do_100_continue = PROXY_DO_100_CONTINUE(worker, r);
if (fpr1) {
/*
* According to RFC 2616 8.2.3 we are not allowed to forward an
* Expect: 100-continue to an HTTP/1.0 server. Instead we MUST return
* a HTTP_EXPECTATION_FAILED
*/
if (r->expecting_100) {
return HTTP_EXPECTATION_FAILED;
}
buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.0" CRLF, NULL);
p_conn->close = 1;
} else {
buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.1" CRLF, NULL);
if (apr_table_get(r->subprocess_env, "force-proxy-request-1.0")) {
force10 = 1;
}
if (apr_table_get(r->subprocess_env, "proxy-nokeepalive")) {
else if (PROXY_SHOULD_PING_100_CONTINUE(worker, r)) {
ping100 = 1;
}
if (force10 || apr_table_get(r->subprocess_env, "proxy-nokeepalive")) {
if (origin) {
origin->keepalive = AP_CONN_CLOSE;
}
p_conn->close = 1;
}
if (force10) {
buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.0" CRLF, NULL);
}
else {
buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.1" CRLF, NULL);
}
ap_xlate_proto_to_ascii(buf, strlen(buf));
e = apr_bucket_pool_create(buf, strlen(buf), p, c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(header_brigade, e);
@@ -4016,16 +4012,17 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
/* Use HTTP/1.1 100-Continue as quick "HTTP ping" test
* to backend
*/
if (do_100_continue) {
const char *val;
if (ping100) {
/* Add the Expect header if not already there. */
if (((val = apr_table_get(request_headers, "Expect")) == NULL)
|| (ap_cstr_casecmp(val, "100-Continue") != 0 /* fast path */
&& !ap_find_token(r->pool, val, "100-Continue"))) {
const char *val = apr_table_get(request_headers, "Expect");
if (!val || (ap_cstr_casecmp(val, "100-Continue") != 0 /* fast path */
&& !ap_find_token(r->pool, val, "100-Continue"))) {
apr_table_mergen(request_headers, "Expect", "100-Continue");
}
}
else if (force10 || !dconf->forward_100_continue || !r->expecting_100) {
apr_table_unset(request_headers, "Expect");
}
/* X-Forwarded-*: handling
*
@@ -4101,7 +4098,8 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
* request bodies, it seems unwise to clear any Trailer
* header present. Is this the correct thing now?
*/
if (fpr1) apr_table_unset(request_headers, "Trailer");
if (force10)
apr_table_unset(request_headers, "Trailer");
apr_table_unset(request_headers, "Upgrade");