]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix comment and code to be what it should have been/
authorJim Jagielski <jim@apache.org>
Tue, 17 Aug 2010 19:59:39 +0000 (19:59 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 17 Aug 2010 19:59:39 +0000 (19:59 +0000)
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

modules/proxy/mod_proxy_http.c

index 2c93e361c3ca9e89581838e1dfbc92dc82f3521a..a8752041c99549a647f589205eda16356446f6d4 100644 (file)
@@ -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")));