You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2019/02/14 08:45:36 UTC
svn commit: r1853566 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Author: ylavic
Date: Thu Feb 14 08:45:36 2019
New Revision: 1853566
URL: http://svn.apache.org/viewvc?rev=1853566&view=rev
Log:
mod_proxy_http: follow up to r1853561.
Handle "proxy-sendextracrlf" within the loop too.
Btw, this extra CRLF heresy should go (at least in trunk)
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
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=1853566&r1=1853565&r2=1853566&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Thu Feb 14 08:45:36 2019
@@ -364,6 +364,11 @@ static int stream_reqbody_chunked(proxy_
CRLF_ASCII,
5, bucket_alloc);
APR_BRIGADE_INSERT_TAIL(input_brigade, e);
+
+ if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) {
+ e = apr_bucket_immortal_create(CRLF_ASCII, 2, bucket_alloc);
+ APR_BRIGADE_INSERT_TAIL(input_brigade, e);
+ }
}
}
@@ -380,14 +385,7 @@ static int stream_reqbody_chunked(proxy_
}
} while (!seen_eos);
- if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) {
- e = apr_bucket_immortal_create(CRLF_ASCII, 2, bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(input_brigade, e);
- }
-
- /* Now we have headers-only, or the chunk EOS mark; flush it */
- return ap_proxy_pass_brigade(bucket_alloc, r, p_conn, req->origin,
- input_brigade, 1);
+ return OK;
}
static int stream_reqbody_cl(proxy_http_req_t *req)