You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2002/04/07 21:12:27 UTC

cvs commit: apache-1.3/src/modules/proxy proxy_http.c

minfrin     02/04/07 12:12:27

  Modified:    src      CHANGES
               src/modules/proxy proxy_http.c
  Log:
  Correct a timeout problem within proxy which would force long
  or slow POST requests to close after 300 seconds.
  PR: 7572
  Submitted by:	Martin Lichtin <ma...@lichtin.net>, Brian Bothwell <br...@wisdomtools.com>
  
  Revision  Changes    Path
  1.1806    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1805
  retrieving revision 1.1806
  diff -u -r1.1805 -r1.1806
  --- CHANGES	7 Apr 2002 18:57:34 -0000	1.1805
  +++ CHANGES	7 Apr 2002 19:12:26 -0000	1.1806
  @@ -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 <ma...@lichtin.net>, Brian Bothwell
  +     <br...@wisdomtools.com>]
  +
     *) Add support for dechunking chunked responses in proxy.
        [Graham Leggett]
   
  
  
  
  1.92      +3 -1      apache-1.3/src/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_http.c,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- proxy_http.c	7 Apr 2002 18:57:36 -0000	1.91
  +++ proxy_http.c	7 Apr 2002 19:12:27 -0000	1.92
  @@ -387,8 +387,10 @@
   
       /* 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);