Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 28 Dec 2000 23:27:23 -0000
Message-ID: <20001228232723.71900.qmail@locus.apache.org>
From: rbb@locus.apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/http http_core.c

rbb         00/12/28 15:27:22

  Modified:    modules/http http_core.c
  Log:
  Because we can't get APR_EAGAIN from sendfile if we have a timeout, we
  can simplify this test now.
  
  Revision  Changes    Path
  1.232     +1 -1      httpd-2.0/modules/http/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_core.c,v
  retrieving revision 1.231
  retrieving revision 1.232
  diff -u -r1.231 -r1.232
  --- http_core.c	2000/12/22 23:43:16	1.231
  +++ http_core.c	2000/12/28 23:27:20	1.232
  @@ -2605,7 +2605,7 @@
           rv = apr_sendfile(c->client_socket, fd, hdtr, &file_offset, &tmplen, 
                             flags);
           total_bytes_left -= tmplen;
  -        if (!total_bytes_left || (rv != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(rv))) {
  +        if (!total_bytes_left || rv != APR_SUCCESS) {
               return rv;        /* normal case & error exit */ 
           }