From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 18 23:50:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8D7D16A422 for ; Sat, 18 Mar 2006 23:50:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F00A343D55 for ; Sat, 18 Mar 2006 23:50:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2INoG0n025537 for ; Sat, 18 Mar 2006 23:50:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2INoGRC025532; Sat, 18 Mar 2006 23:50:16 GMT (envelope-from gnats) Resent-Date: Sat, 18 Mar 2006 23:50:16 GMT Resent-Message-Id: <200603182350.k2INoGRC025532@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas-Martin Seck Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4EE316A439 for ; Sat, 18 Mar 2006 23:40:43 +0000 (UTC) (envelope-from tmseck@netcologne.de) Received: from smtp3.netcologne.de (smtp3.netcologne.de [194.8.194.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id E381743D53 for ; Sat, 18 Mar 2006 23:40:38 +0000 (GMT) (envelope-from tmseck@netcologne.de) Received: from laurel.tmseck.homedns.org (xdsl-213-196-252-71.netcologne.de [213.196.252.71]) by smtp3.netcologne.de (Postfix) with SMTP id 1DE63674B3 for ; Sun, 19 Mar 2006 00:40:37 +0100 (CET) Received: (qmail 2856 invoked from network); 18 Mar 2006 23:40:59 -0000 Received: from unknown (HELO bledge.tmseck.homedns.org) (192.168.1.4) by 0 with SMTP; 18 Mar 2006 23:40:59 -0000 Received: from bledge.tmseck.homedns.org (localhost [127.0.0.1]) by bledge.tmseck.homedns.org (8.13.4/8.13.4) with ESMTP id k2INeZ3a076223; Sun, 19 Mar 2006 00:40:35 +0100 (CET) (envelope-from tmseck@netcologne.de) Received: (from thomas@localhost) by bledge.tmseck.homedns.org (8.13.4/8.13.4/Submit) id k2INeYZS076222; Sun, 19 Mar 2006 00:40:34 +0100 (CET) (envelope-from tmseck@netcologne.de) Message-Id: <200603182340.k2INeYZS076222@bledge.tmseck.homedns.org> Date: Sun, 19 Mar 2006 00:40:34 +0100 (CET) From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/94665: [Maintainer] www/squid: unbreak WITH_SQUID_CUSTOM_LOG X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thomas-Martin Seck List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 23:50:17 -0000 >Number: 94665 >Category: ports >Synopsis: [Maintainer] www/squid: unbreak WITH_SQUID_CUSTOM_LOG >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Mar 18 23:50:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 5.4-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as at March 19, 2006. >Description: - Unbreak the port when WITH_SQUID_CUSTOM_LOG is defined by updating the customlog patchset to recent CVS. - Bump PORTREVISION. >How-To-Repeat: cd /usr/ports/www/squid && make -DWITH_SQUID_CUSTOM_LOG patch >Fix: Apply this patch: Index: files/customlog-2.5.patch =================================================================== --- files/customlog-2.5.patch (.../www/squid) (revision 734) +++ files/customlog-2.5.patch (.../local/squid) (revision 734) @@ -1230,10 +1230,9 @@ ADMINISTRATIVE PARAMETERS ----------------------------------------------------------------------------- Index: src/client_side.c -diff -u src/client_side.c:1.47.2.61 src/client_side.c:1.47.2.31.2.10 ---- src/client_side.c:1.47.2.61 Wed Apr 20 19:14:36 2005 -+++ src/client_side.c Thu May 26 21:34:14 2005 -@@ -850,14 +850,18 @@ +--- src/client_side.c.orig Fri Mar 10 23:58:35 2006 ++++ src/client_side.c Sat Mar 18 23:53:25 2006 +@@ -871,14 +871,18 @@ http->al.cache.code = http->log_type; http->al.cache.msec = tvSubMsec(http->start, current_time); if (request) { @@ -1258,7 +1257,7 @@ http->al.hier = request->hier; if (request->auth_user_request) { if (authenticateUserRequestUsername(request->auth_user_request)) -@@ -867,12 +871,15 @@ +@@ -888,12 +892,17 @@ } if (conn->rfc931[0]) http->al.cache.rfc931 = conn->rfc931; @@ -1271,7 +1270,9 @@ + http->al.request = request; + if (!http->acl_checklist) + http->acl_checklist = clientAclChecklistCreate(Config.accessList.http, http); ++ http->acl_checklist->reply = http->reply; + if (!Config.accessList.log || aclCheckFast(Config.accessList.log, http->acl_checklist)) { ++ http->al.reply = http->reply; + accessLogLog(&http->al, http->acl_checklist); + clientUpdateCounters(http); + clientdbUpdate(conn->peer.sin_addr, http->log_type, PROTO_HTTP, http->out.size); @@ -1279,50 +1280,32 @@ } if (http->acl_checklist) aclChecklistFree(http->acl_checklist); -@@ -883,6 +890,11 @@ +@@ -904,6 +913,7 @@ safe_free(http->al.headers.request); safe_free(http->al.headers.reply); safe_free(http->al.cache.authuser); -+ if (http->al.reply) { -+ httpReplyDestroy(http->al.reply); -+ http->al.reply = NULL; -+ } + http->al.request = NULL; safe_free(http->redirect.location); stringClean(&http->range_iter.boundary); if ((e = http->entry)) { -@@ -1981,6 +1993,7 @@ - } - if (http->out.offset == 0) { - rep = clientBuildReply(http, buf, size); -+ http->al.reply = rep; - if (rep) { - aclCheck_t *ch; - int rv; -@@ -2003,7 +2016,6 @@ +@@ -2031,8 +2041,6 @@ http->entry = clientCreateStoreEntry(http, http->request->method, null_request_flags); errorAppendEntry(http->entry, err); -- httpReplyDestroy(rep); +- httpReplyDestroy(http->reply); +- http->reply = NULL; memFree(buf, MEM_CLIENT_SOCK_BUF); return; } -@@ -2038,7 +2050,6 @@ +@@ -2067,8 +2075,6 @@ http->entry = clientCreateStoreEntry(http, http->request->method, null_request_flags); errorAppendEntry(http->entry, err); -- httpReplyDestroy(rep); +- httpReplyDestroy(http->reply); +- http->reply = NULL; memFree(buf, MEM_CLIENT_SOCK_BUF); return; } -@@ -2086,7 +2097,6 @@ - #if HEADERS_LOG - headersLog(0, 0, http->request->method, rep); - #endif -- httpReplyDestroy(rep); - rep = NULL; - } else { - memBufDefInit(&mb); 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 (.../www/squid) (revision 734) +++ Makefile (.../local/squid) (revision 734) @@ -73,6 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.13 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ >Release-Note: >Audit-Trail: >Unformatted: