diff options
| author | anders <anders@FreeBSD.org> | 2007-06-18 03:37:11 +0800 |
|---|---|---|
| committer | anders <anders@FreeBSD.org> | 2007-06-18 03:37:11 +0800 |
| commit | 7d26ae04b261bfd1525578eedd91753ef077f8a7 (patch) | |
| tree | f02a54c933514c2cd42ccbda6e5e75df92d425a5 | |
| parent | 5debf1f7df34d7475b67d4d66a3db48adba88619 (diff) | |
| download | freebsd-ports-gnome-7d26ae04b261bfd1525578eedd91753ef077f8a7.tar.gz freebsd-ports-gnome-7d26ae04b261bfd1525578eedd91753ef077f8a7.tar.zst freebsd-ports-gnome-7d26ae04b261bfd1525578eedd91753ef077f8a7.zip | |
Do not log sendfile calls that return with ENOTCONN when USE_SENDFILE is
used, it is not interesting.
Bump PORTREVISION.
PR: ports/91843
Submitted by: Ben Goetter <goetter@mazama.net>
| -rw-r--r-- | www/thttpd/Makefile | 2 | ||||
| -rw-r--r-- | www/thttpd/files/patch-thttpd.c | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index fe95661eb52d..30c092152d74 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= thttpd PORTVERSION= 2.25b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/thttpd/ \ http://atreides.freenix.no/~anders/ diff --git a/www/thttpd/files/patch-thttpd.c b/www/thttpd/files/patch-thttpd.c index fa528be7f9e5..ffebb143cd0f 100644 --- a/www/thttpd/files/patch-thttpd.c +++ b/www/thttpd/files/patch-thttpd.c @@ -1,5 +1,5 @@ ---- thttpd.c.orig Thu Dec 25 19:06:52 2003 -+++ thttpd.c Fri May 28 12:25:54 2004 +--- thttpd.c.orig Wed Jun 29 19:50:59 2005 ++++ thttpd.c Sun Jun 17 21:30:11 2007 @@ -1723,12 +1723,45 @@ if ( hc->responselen == 0 ) { @@ -54,3 +54,16 @@ } if ( sz < 0 && errno == EINTR ) +@@ -1786,7 +1820,11 @@ + ** + ** And ECONNRESET isn't interesting either. + */ +- if ( errno != EPIPE && errno != EINVAL && errno != ECONNRESET ) ++ if ( errno != EPIPE && errno != EINVAL && errno != ECONNRESET ++#ifdef USE_SENDFILE ++ && errno != ENOTCONN ++#endif ++ ) + syslog( LOG_ERR, "write - %m sending %.80s", hc->encodedurl ); + clear_connection( c, tvP ); + return; |