You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2010/08/17 21:59:40 UTC
svn commit: r986468 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Author: jim
Date: Tue Aug 17 19:59:39 2010
New Revision: 986468
URL: http://svn.apache.org/viewvc?rev=986468&view=rev
Log:
Fix comment and code to be what it should have been/
thx to r and r for spotting this foobar.
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=986468&r1=986467&r2=986468&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Tue Aug 17 19:59:39 2010
@@ -705,14 +705,14 @@ int ap_proxy_http_request(apr_pool_t *p,
*/
/*
- * 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_respo
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")));