Date: Sat, 3 Jun 2006 18:20:43 +0200 (CEST) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98449: [Maintainer] www/squid: fix assertion failure in HttpReply.c Message-ID: <200606031620.k53GKhSp005627@hardy.tmseck.homedns.org> Resent-Message-ID: <200606031630.k53GUIdL043133@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98449 >Category: ports >Synopsis: [Maintainer] www/squid: fix assertion failure in HttpReply.c >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 03 16:30:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.1-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of June 3, 2006. >Description: - Integrate a vendor patch published on <http://www.squid-cache.org/Versions/v2/2.5/bugs/>; to fix an "assertion failed: HttpReply.c:105: rep" error (squid bug #1606). - Update the customlog patchset accordingly. - Bump PORTREVISION. >How-To-Repeat: >Fix: Apply this patch: Index: distinfo =================================================================== --- distinfo (revision 876) +++ distinfo (revision 877) @@ -1,3 +1,6 @@ MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745 +MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4 +SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285 +SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277 Index: files/customlog-2.5.patch =================================================================== --- files/customlog-2.5.patch (revision 876) +++ files/customlog-2.5.patch (revision 877) @@ -1289,24 +1289,6 @@ safe_free(http->redirect.location); stringClean(&http->range_iter.boundary); if ((e = http->entry)) { -@@ -2031,8 +2041,6 @@ - http->entry = clientCreateStoreEntry(http, http->request->method, - null_request_flags); - errorAppendEntry(http->entry, err); -- httpReplyDestroy(http->reply); -- http->reply = NULL; - memFree(buf, MEM_CLIENT_SOCK_BUF); - return; - } -@@ -2067,8 +2075,6 @@ - http->entry = clientCreateStoreEntry(http, http->request->method, - null_request_flags); - errorAppendEntry(http->entry, err); -- httpReplyDestroy(http->reply); -- http->reply = NULL; - memFree(buf, MEM_CLIENT_SOCK_BUF); - return; - } Index: src/icp_v2.c diff -u src/icp_v2.c:1.5 src/icp_v2.c:1.5.60.1 --- src/icp_v2.c:1.5 Fri May 4 06:39:12 2001 Index: Makefile =================================================================== --- Makefile (revision 876) +++ Makefile (revision 877) @@ -73,6 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.14 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -89,7 +90,7 @@ DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= +PATCHFILES= squid-2.5.STABLE14-httpReplyDestroy.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606031620.k53GKhSp005627>