- Backport EPIPE case in sendfile backend. [1]

- portlint(1)
- Bump PORTREVISION

Reported by:	Jeroen Ruigrok van der Werven <asmodai__in-nomine.org> [1]
This commit is contained in:
Marcus Alves Grando 2009-02-24 19:06:37 +00:00
parent 1be10588a3
commit cdb4dd0cea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=229007
2 changed files with 11 additions and 8 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= lighttpd
PORTVERSION= 1.4.21
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.lighttpd.net/download/ \
http://mirrors.cat.pdx.edu/lighttpd/
@ -23,7 +23,6 @@ GNU_CONFIGURE= yes
USE_GNOME= lthack
USE_RC_SUBR= lighttpd.sh
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd
CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib

View File

@ -1,14 +1,18 @@
#
# Backport http://redmine.lighttpd.net/projects/lighttpd/repository/revisions/2403
# Backport http://redmine.lighttpd.net/issues/show/1913
#
--- src/network_freebsd_sendfile.c.orig 2009-02-24 11:05:06.000000000 -0300
+++ src/network_freebsd_sendfile.c 2009-02-24 11:12:15.000000000 -0300
@@ -167,7 +167,7 @@
--- src/network_freebsd_sendfile.c.orig 2009-02-05 09:41:44.000000000 -0200
+++ src/network_freebsd_sendfile.c 2009-02-24 15:11:29.000000000 -0300
@@ -167,8 +167,9 @@
switch(errno) {
case EAGAIN:
case EINTR:
- r = 0; /* try again later */
+ /* for EAGAIN and EINTR r still contains the sent bytes */
break;
- break;
+ /* for EAGAIN/EINTR r still contains the sent bytes */
+ break; /* try again later */
+ case EPIPE:
case ENOTCONN:
return -2;
default: