httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r986333 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Date Tue, 17 Aug 2010 14:43:45 GMT
Author: jim
Date: Tue Aug 17 14:43:45 2010
New Revision: 986333

URL: http://svn.apache.org/viewvc?rev=986333&view=rev
Log:
Further checks for non-body requests...

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=986333&r1=986332&r2=986333&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Tue Aug 17 14:43:45 2010
@@ -704,8 +704,15 @@ int ap_proxy_http_request(apr_pool_t *p,
      * Send the HTTP/1.1 request to the remote server
      */
 
+    /*
+     * To be compliant, we only use 100-Continue for requests with no 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"))
                        && (PROXYREQ_REVERSE == r->proxyreq)
                        && !(apr_table_get(r->subprocess_env, "force-proxy-request-1.0")));
     
@@ -1397,10 +1404,12 @@ 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"))
                        && (PROXYREQ_REVERSE == r->proxyreq)
                        && !(apr_table_get(r->subprocess_env, "force-proxy-request-1.0")));
     
-    
     bb = apr_brigade_create(p, c->bucket_alloc);
     pass_bb = apr_brigade_create(p, c->bucket_alloc);
     



Mime
View raw message