From d8961b36057bd507cc1b6226ce1ad81eb45ff662 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 4 Sep 2007 19:33:45 +0000 Subject: [PATCH] Fix PR 43183 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@572787 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 7 ------- modules/proxy/proxy_http.c | 6 ++++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 011991be234..d5b9081c0ec 100644 --- a/CHANGES +++ b/CHANGES @@ -20,6 +20,9 @@ Changes with Apache 2.0.61 be forced to kill processes outside its process group. [Joe Orton, Jim Jagielski] + *) mod_proxy_http: accept proxy-sendchunked/proxy-sendchunks as synonymous. + PR 43183 [Brian Rectanus , Vincent Bray] + *) log core: ensure we use a special pool for stderr logging, so that the stderr channel remains valid from the time plog is destroyed, until the time the open_logs hook is called again. [William Rowe] diff --git a/STATUS b/STATUS index 70b8be2ea0d..07c4f5460d9 100644 --- a/STATUS +++ b/STATUS @@ -116,13 +116,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_proxy_http: make proxy-sendchunked work as documented. - PR 43183 - Trunk version of patch: - http://svn.apache.org/viewcvs.cgi?rev=572000&view=rev - 2.0 version: noodl's patch at - http://issues.apache.org/bugzilla/attachment.cgi?id=20700 - +1: niq, rpluem, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ please place SVN revisions from trunk here, so it is easy to diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c index acdddaefe2f..6cc187dbcd3 100644 --- a/modules/proxy/proxy_http.c +++ b/modules/proxy/proxy_http.c @@ -1211,7 +1211,8 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r, else if (old_te_val) { if (force10 || (apr_table_get(r->subprocess_env, "proxy-sendcl") - && !apr_table_get(r->subprocess_env, "proxy-sendchunks"))) { + && !apr_table_get(r->subprocess_env, "proxy-sendchunks") + && !apr_table_get(r->subprocess_env, "proxy-sendchunked"))) { rb_method = RB_SPOOL_CL; } else { @@ -1223,7 +1224,8 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r, rb_method = RB_STREAM_CL; } else if (!force10 - && apr_table_get(r->subprocess_env, "proxy-sendchunks") + && (apr_table_get(r->subprocess_env, "proxy-sendchunks") + || apr_table_get(r->subprocess_env, "proxy-sendchunked")) && !apr_table_get(r->subprocess_env, "proxy-sendcl")) { rb_method = RB_STREAM_CHUNKED; } -- 2.47.2