add a patch from upstream's stable diff; fix memleak with malformed headers.

This commit is contained in:
sthen 2013-01-02 11:21:13 +00:00
parent 59ee0568e8
commit 11c3bb5bfe
2 changed files with 17 additions and 2 deletions

View File

@ -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

View File

@ -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,