Changeset 2072

Show
Ignore:
Timestamp:
02/10/2008 06:49:39 PM (5 months ago)
Author:
jan
Message:

fixed handling of EAGAIN in linux-sendfile (fixes #657)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

    • Property bzr:revision-id:v3-none set to
      2073 jan@kneschke.de-20080210184328-0ab8yqv19bb25j4o
    • Property bzr:file-ids set
    • Property bzr:revision-info set to
      timestamp: 2008-02-10 19:43:28.592000008 +0100
      committer: Jan Kneschke <jan@kneschke.de>
      properties:
      branch-nick: lighttpd-1.4.x

  • branches/lighttpd-1.4.x/NEWS

    r2066 r2072  
    2424  * fixed bogus "cgi died ?" if we kill the CGI process on shutdown 
    2525  * fixed ECONNRESET handling in network-openssl 
     26  * fixed handling of EAGAIN in network-linux-sendfile (#657) 
    2627 
    2728- 1.4.18 - 2007-09-09 

  • branches/lighttpd-1.4.x/src/network_linux_sendfile.c

    r1386 r2072  
    163163                                case EAGAIN: 
    164164                                case EINTR: 
     165                                        /* ok, we can't send more, let's try later again */ 
    165166                                        r = 0; 
    166167                                        break; 
    …… 
    173174                                        return -1; 
    174175                                } 
    175                         } 
    176  
    177                         if (r == 0) { 
     176                        } else if (r == 0) { 
    178177                                int oerrno = errno; 
    179178                                /* We got an event to write but we wrote nothing