Correct a timeout problem within proxy which would force long

or slow POST requests to close after 300 seconds.
PR: 7572
Obtained from:
Submitted by:	Martin Lichtin <martin@lichtin.net>, Brian Bothwell <brian.bothwell@wisdomtools.com>
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@94524 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index 6d84c316e8ab0898b74bd7ed07e1222d101f6a7a..cd7814164b92582668b12a972c98a8b56b38cddb 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 1.3.25
 
+  *) Correct a timeout problem within proxy which would force long
+     or slow POST requests to close after 300 seconds.
+     [Martin Lichtin <martin@lichtin.net>, Brian Bothwell
+     <brian.bothwell@wisdomtools.com>]
+
   *) Add support for dechunking chunked responses in proxy.
      [Graham Leggett]
 

diff --git a/src/modules/proxy/proxy_http.c b/src/modules/proxy/proxy_http.c
index d6d46a2e61d0c8bda00c0ad2c54c2e87630bfad3..05c8ef685d8e4d05d334a0b471222823f5700462 100644 (file)
--- a/src/modules/proxy/proxy_http.c
+++ b/src/modules/proxy/proxy_http.c
@@ -387,8 +387,10 @@ int ap_proxy_http_handler(request_rec *r, cache_req *c, char *url,
 
     /* send the request data, if any. */
     if (ap_should_client_block(r)) {
-        while ((i = ap_get_client_block(r, buffer, sizeof buffer)) > 0)
+        while ((i = ap_get_client_block(r, buffer, sizeof buffer)) > 0) {
+            ap_reset_timeout(r);
             ap_bwrite(f, buffer, i);
+        }
     }
     ap_bflush(f);
     ap_kill_timeout(r);