diff options
| author | Jim Jagielski <jim@apache.org> | 2010-08-17 21:59:39 +0200 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2010-08-17 21:59:39 +0200 |
| commit | 864c25bbad45701025d2d7d5aba4b81fceb0b289 (patch) | |
| tree | 68c81b3820ee5884e0c15f82b195f65650e6c204 /modules/proxy/mod_proxy_http.c | |
| parent | Update transformations. (diff) | |
| download | apache2-864c25bbad45701025d2d7d5aba4b81fceb0b289.tar.xz apache2-864c25bbad45701025d2d7d5aba4b81fceb0b289.zip | |
Fix comment and code to be what it should have been/
thx to r and r for spotting this foobar.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@986468 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/mod_proxy_http.c')
| -rw-r--r-- | modules/proxy/mod_proxy_http.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c index 2c93e361c3..a8752041c9 100644 --- a/modules/proxy/mod_proxy_http.c +++ b/modules/proxy/mod_proxy_http.c @@ -705,14 +705,14 @@ int ap_proxy_http_request(apr_pool_t *p, request_rec *r, */ /* - * To be compliant, we only use 100-Continue for requests with no bodies. + * 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. */ do_100_continue = (worker->ping_timeout_set && !r->header_only - && !r->kept_body - && !(apr_table_get(r->headers_in, "Content-Length")) - && !(apr_table_get(r->headers_in, "Transfer-Encoding")) + && (r->kept_body + || apr_table_get(r->headers_in, "Content-Length") + || apr_table_get(r->headers_in, "Transfer-Encoding")) && (PROXYREQ_REVERSE == r->proxyreq) && !(apr_table_get(r->subprocess_env, "force-proxy-request-1.0"))); @@ -1404,9 +1404,9 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, do_100_continue = (worker->ping_timeout_set && !r->header_only - && !r->kept_body - && !(apr_table_get(r->headers_in, "Content-Length")) - && !(apr_table_get(r->headers_in, "Transfer-Encoding")) + && (r->kept_body + || apr_table_get(r->headers_in, "Content-Length") + || apr_table_get(r->headers_in, "Transfer-Encoding")) && (PROXYREQ_REVERSE == r->proxyreq) && !(apr_table_get(r->subprocess_env, "force-proxy-request-1.0"))); |