Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1807318 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Date: Tue, 05 Sep 2017 07:27:34 -0000
To: cvs@httpd.apache.org
From: jfclere@apache.org
Message-Id: <20170905072736.94B4B3A00A7@svn01-us-west.apache.org>
archived-at: Tue, 05 Sep 2017 07:27:39 -0000

Author: jfclere
Date: Tue Sep  5 07:27:33 2017
New Revision: 1807318

URL: http://svn.apache.org/viewvc?rev=1807318&view=rev
Log:
Fix for JBCS-390.
Note it is related to PR  59007


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=1807318&r1=1807317&r2=1807318&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Tue Sep  5 07:27:33 2017
@@ -1556,11 +1556,14 @@ int ap_proxy_http_process_response(apr_p
 
         if (ap_is_HTTP_INFO(proxy_status)) {
             interim_response++;
-            /* Reset to old timeout iff we've adjusted it */
             if (do_100_continue
-                && (r->status == HTTP_CONTINUE)
-                && (worker->s->ping_timeout != old_timeout)) {
+                && (r->status == HTTP_CONTINUE)) {
+                /* Done with the 100 continue */
+                do_100_continue = 0;
+                /* Reset to old timeout if we've adjusted it */
+                if  (worker->s->ping_timeout != old_timeout) {
                     apr_socket_timeout_set(backend->sock, old_timeout);
+                }
             }
         }
         else {