diff options
| author | Anders Nordby <anders@FreeBSD.org> | 2003-10-28 21:58:59 +0000 |
|---|---|---|
| committer | Anders Nordby <anders@FreeBSD.org> | 2003-10-28 21:58:59 +0000 |
| commit | 042a25b326fa15c8e3704211ef442e7911ef1fe6 (patch) | |
| tree | 9772299155921e90e3106cb72b70254e6bc90b99 /www | |
| parent | Under certain conditions (perl Makefile.PL used directly or by proxy, (diff) | |
Update to 2.24.
Older versions of thttpd has a remote overflow.
Security advisory: http://www.texonet.com/advisories/TEXONET-20030908.txt
PR: 58648
Notes
Notes:
svn path=/head/; revision=92489
Diffstat (limited to 'www')
| -rw-r--r-- | www/thttpd/Makefile | 3 | ||||
| -rw-r--r-- | www/thttpd/distinfo | 2 | ||||
| -rw-r--r-- | www/thttpd/files/patch-thttpd.c | 16 |
3 files changed, 10 insertions, 11 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 2ae7d1a3037f..fc73dccec789 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -6,11 +6,10 @@ # PORTNAME= thttpd -PORTVERSION= 2.23 +PORTVERSION= 2.24 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/thttpd/ \ http://atreides.freenix.no/~anders/ -DISTNAME= ${PORTNAME}-${PORTVERSION}beta1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} notes.html DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo index 2e3b7999f5db..b4408b64c33b 100644 --- a/www/thttpd/distinfo +++ b/www/thttpd/distinfo @@ -1,2 +1,2 @@ -MD5 (thttpd/thttpd-2.23beta1.tar.gz) = 43ec67b2765353a942fea72ceaf4d118 +MD5 (thttpd/thttpd-2.24.tar.gz) = 9e72c27986548d0cbc8ea850b7b47bdd MD5 (thttpd/notes.html) = IGNORE diff --git a/www/thttpd/files/patch-thttpd.c b/www/thttpd/files/patch-thttpd.c index c538dce4b73a..fde13bd8bbe3 100644 --- a/www/thttpd/files/patch-thttpd.c +++ b/www/thttpd/files/patch-thttpd.c @@ -1,6 +1,6 @@ ---- thttpd.c.orig Sat May 25 19:43:13 2002 -+++ thttpd.c Sun Oct 20 23:58:44 2002 -@@ -1500,12 +1500,45 @@ +--- thttpd.c.orig Tue May 13 17:14:33 2003 ++++ thttpd.c Wed Oct 29 05:50:14 2003 +@@ -1593,12 +1593,45 @@ if ( hc->responselen == 0 ) { /* No, just write the file. */ @@ -9,7 +9,7 @@ + + sz = sendfile( + hc->file_fd, hc->conn_fd, c->bytes_sent, -+ MIN( c->bytes_to_send - c->bytes_sent, c->limit ), ++ MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ), + NULL, &sbytes, 0 ); + if (sz == -1 && errno == EAGAIN) + sz = sbytes > 0 ? sbytes : -1; @@ -18,7 +18,7 @@ +#else sz = write( hc->conn_fd, &(hc->file_address[c->bytes_sent]), - MIN( c->bytes_to_send - c->bytes_sent, c->limit ) ); + MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ) ); +#endif } else @@ -36,7 +36,7 @@ + sf.trl_cnt = 0; + sz = sendfile( + hc->file_fd, hc->conn_fd, c->bytes_sent, -+ MIN( c->bytes_to_send - c->bytes_sent, c->limit ), ++ MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ), + &sf, &sbytes, 0 ); + if (sz == -1 && errno == EAGAIN) + sz = sbytes > 0 ? sbytes : -1; @@ -46,9 +46,9 @@ /* Yes. We'll combine headers and file into a single writev(), ** hoping that this generates a single packet. */ -@@ -1516,6 +1549,7 @@ +@@ -1609,6 +1642,7 @@ iv[1].iov_base = &(hc->file_address[c->bytes_sent]); - iv[1].iov_len = MIN( c->bytes_to_send - c->bytes_sent, c->limit ); + iv[1].iov_len = MIN( c->bytes_to_send - c->bytes_sent, c->max_limit ); sz = writev( hc->conn_fd, iv, 2 ); +#endif } |