]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix for JBCS-390.
authorJean-Frederic Clere <jfclere@apache.org>
Tue, 5 Sep 2017 07:27:33 +0000 (07:27 +0000)
committerJean-Frederic Clere <jfclere@apache.org>
Tue, 5 Sep 2017 07:27:33 +0000 (07:27 +0000)
Note it is related to PR  59007

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807318 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/mod_proxy_http.c

index fc9c0440216fbdf5e807ae0eeb68ba68992f22f2..0acab13892fb14bf593ad67530ac5a843e186d23 100644 (file)
@@ -1556,11 +1556,14 @@ int ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
 
         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 {