From 11c3bb5bfe3146f035eefe65222b82fc0616a910 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 2 Jan 2013 11:21:13 +0000 Subject: [PATCH] add a patch from upstream's stable diff; fix memleak with malformed headers. --- www/squid27/Makefile | 4 ++-- www/squid27/patches/patch-src_client_side_c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 www/squid27/patches/patch-src_client_side_c diff --git a/www/squid27/Makefile b/www/squid27/Makefile index ab09853f844..e27ea35e783 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2013/01/02 10:12:02 sthen Exp $ +# $OpenBSD: Makefile,v 1.2 2013/01/02 11:21:13 sthen Exp $ COMMENT= WWW and FTP proxy cache and accelerator DISTNAME= squid-2.7.STABLE9 -REVISION= 21 +REVISION= 22 CATEGORIES= www MASTER_SITES= ${HOMEPAGE}/Versions/v2/2.7/ DIST_SUBDIR= squid diff --git a/www/squid27/patches/patch-src_client_side_c b/www/squid27/patches/patch-src_client_side_c new file mode 100644 index 00000000000..db08ae1af1b --- /dev/null +++ b/www/squid27/patches/patch-src_client_side_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_client_side_c,v 1.1 2013/01/02 11:21:13 sthen Exp $ + +fix a leak with malformed headers: 1.754.2.30 upstream, extracted from +http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE9-20110824.diff + +--- src/client_side.c.orig Wed Jan 2 10:15:50 2013 ++++ src/client_side.c Wed Jan 2 10:16:07 2013 +@@ -3063,6 +3063,7 @@ clientCheckHeaderDone(clientHttpRequest * http) + if (mb.size > 0) { + comm_write_mbuf(http->conn->fd, mb, clientWriteComplete, http); + } else { ++ memBufClean(&mb); + storeClientCopy(http->sc, http->entry, + http->out.offset, + http->out.offset,