summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2005-08-08 01:28:14 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2005-08-08 01:28:14 +0000
commit2fe0def390e507f8bb02a2551dd90f6d5199a5c1 (patch)
treeaaef4cd4f6f1433cdde84ad31d406a0e9f686ba9
parent70dedec432758a2dc305759530923ffcfd53356f (diff)
downloadhttpd-2fe0def390e507f8bb02a2551dd90f6d5199a5c1.tar.gz
Backport the fix to an edge case, it's now possible for a primary
request which has a body in spite of what was determined by the header parsing; this would usually be due to an input filter between the client request and mod_proxy. Add another consideration, and force the C-L determination if we saw bytes in already. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/proxy-reqbody-2.0.x@230726 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/proxy/proxy_http.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 00bdb80605..5575e7e1ac 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -1144,7 +1144,8 @@ skip_body:
case RB_SPOOL_CL:
status = spool_reqbody_cl(p, r, p_conn, origin, bb,
input_brigade, (old_cl_val != NULL)
- || (old_te_val != NULL));
+ || (old_te_val != NULL)
+ || (bytes_read > 0));
break;
default:
ap_assert(1 != 1);