Date: 26 Oct 1999 22:15:22 -0000
Message-ID: <19991026221522.17664.qmail@hyperreal.org>
From: manoj@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/main http_protocol.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

manoj       99/10/26 15:15:20

  Modified:    src/main http_protocol.c
  Log:
  One ap_bflush to the client wasn't checked. Now fixed.
  
  Revision  Changes    Path
  1.25      +4 -2      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -d -u -r1.24 -r1.25
  --- http_protocol.c	1999/10/24 19:23:58	1.24
  +++ http_protocol.c	1999/10/26 22:15:16	1.25
  @@ -2072,7 +2072,7 @@
       char buf[IOBUFSIZE];
       long total_bytes_sent = 0;
       long zero_timeout = 0;
  -    int n, w, rc, o;
  +    int n, w, o;
   
       if (length == 0) {
           return 0;
  @@ -2096,7 +2096,9 @@
                   break;
               }
               /* next read will block, so flush the client now */
  -            rc = ap_bflush(r->connection->client);
  +            if (ap_rflush(r) == EOF) {
  +                break;
  +            }
   
               ap_bsetopt(fb, BO_TIMEOUT, &r->server->timeout);
               n = ap_bread(fb, buf, sizeof(buf));