Date: Mon, 22 May 2006 14:41:24 +0200 (CEST) From: Thomas-Martin Seck <tmseck@netcologne.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/97607: [Maintainer] www/squid: update to 2.5.STABLE14, update ICAP and CUSTOM_LOG patchsets Message-ID: <200605221241.k4MCfOY2065520@hardy.tmseck.homedns.org> Resent-Message-ID: <200605221250.k4MCoIVZ045032@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97607 >Category: ports >Synopsis: [Maintainer] www/squid: update to 2.5.STABLE14, update ICAP and CUSTOM_LOG patchsets >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: Mon May 22 12:50:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 6.0-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of May 22, 2006. >Description: - update squid to 2.5.STABLE14 - accept 7-CURRENT's WITHOUT_NIS switch as a synonym for NO_NIS - add a missing "/" in files/pkg-message.in - update the ICAP core patchset to the latest CVS (2006-05-21) - update the custom logfile patchset to the latest CVS (2006-05-21) >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid) (revision 837) +++ Makefile (.../local/squid) (revision 837) @@ -72,8 +72,7 @@ # PORTNAME= squid -PORTVERSION= 2.5.13 -PORTREVISION= 1 +PORTVERSION= 2.5.14 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -82,14 +81,11 @@ ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,} MASTER_SITE_SUBDIR= squid-2/STABLE -DISTNAME= squid-2.5.STABLE13 +DISTNAME= squid-2.5.STABLE14 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= squid-2.5.STABLE13-hostnamelen.patch \ - squid-2.5.STABLE13-icons.patch \ - squid-2.5.STABLE13-htcp_leak.patch \ - squid-2.5.STABLE13-ident_leak.patch +PATCHFILES= PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -204,7 +200,7 @@ basic_auth+= SASL libexec+= sasl_auth .endif -.if !defined(NO_NIS) +.if !defined(NO_NIS) && !defined(WITHOUT_NIS) basic_auth+= YP libexec+= yp_auth .endif Index: distinfo =================================================================== --- distinfo (.../www/squid) (revision 837) +++ distinfo (.../local/squid) (revision 837) @@ -1,15 +1,3 @@ -MD5 (squid2.5/squid-2.5.STABLE13.tar.bz2) = 3e64468e123be1246d17486dab6bee87 -SHA256 (squid2.5/squid-2.5.STABLE13.tar.bz2) = c4a7cde3d63559576f704b8a10561d61135a3788423ae417fb728d112b1962a8 -SIZE (squid2.5/squid-2.5.STABLE13.tar.bz2) = 1074112 -MD5 (squid2.5/squid-2.5.STABLE13-hostnamelen.patch) = 2e0b558f32a66d8f1daa04b34bb05846 -SHA256 (squid2.5/squid-2.5.STABLE13-hostnamelen.patch) = c31d6395d3f9b81937c844d5776c8f54c54d9d3d0afffced5575dbf00386591e -SIZE (squid2.5/squid-2.5.STABLE13-hostnamelen.patch) = 1057 -MD5 (squid2.5/squid-2.5.STABLE13-icons.patch) = a6802ad3f03bab0cbdee50339440929d -SHA256 (squid2.5/squid-2.5.STABLE13-icons.patch) = 89cc30851796bb80530da70d1c30201ed04a3c37a7293bd6abbe16db09768c0a -SIZE (squid2.5/squid-2.5.STABLE13-icons.patch) = 942 -MD5 (squid2.5/squid-2.5.STABLE13-htcp_leak.patch) = 0439d319892dbf2322a7930ef234996d -SHA256 (squid2.5/squid-2.5.STABLE13-htcp_leak.patch) = d9edd26cef95b02c5192dc54e49a4d9b2ac3b6e47810b0ed7f3c754567c30415 -SIZE (squid2.5/squid-2.5.STABLE13-htcp_leak.patch) = 827 -MD5 (squid2.5/squid-2.5.STABLE13-ident_leak.patch) = dd7e6463c11f81056f7a2326a683116b -SHA256 (squid2.5/squid-2.5.STABLE13-ident_leak.patch) = 84521c58efa05758da2001da7226b94eb1a0aecaf435ba4dca79713fb9ecdb18 -SIZE (squid2.5/squid-2.5.STABLE13-ident_leak.patch) = 723 +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 Index: files/pkg-message.in =================================================================== --- files/pkg-message.in (.../www/squid) (revision 837) +++ files/pkg-message.in (.../local/squid) (revision 837) @@ -19,6 +19,6 @@ This means that squid will not start automatically at boot time. To enable squid, set squid_enable=yes in either - etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid + /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details. --end rcng Index: files/icap-2.5-core.patch =================================================================== --- files/icap-2.5-core.patch (.../www/squid) (revision 837) +++ files/icap-2.5-core.patch (.../local/squid) (revision 837) @@ -20,7 +20,7 @@ See http://devel.squid-cache.org/icap/ for further information about the ICAP client project. -Patch last updated: 2006-03-17 +Patch last updated: 2006-05-21 Index: errors/Azerbaijani/ERR_ICAP_FAILURE =================================================================== @@ -1167,12 +1167,12 @@ Index: include/util.h =================================================================== RCS file: /cvsroot/squid/squid/include/util.h,v -retrieving revision 1.10 -retrieving revision 1.10.30.2 -diff -p -u -b -r1.10 -r1.10.30.2 ---- include/util.h 17 Oct 2001 12:30:51 -0000 1.10 -+++ include/util.h 6 Apr 2004 13:04:37 -0000 1.10.30.2 -@@ -132,4 +132,12 @@ double drand48(void); +retrieving revision 1.10.6.1 +retrieving revision 1.10.30.3 +diff -p -u -b -r1.10.6.1 -r1.10.30.3 +--- include/util.h 12 May 2006 16:51:32 -0000 1.10.6.1 ++++ include/util.h 16 May 2006 17:56:57 -0000 1.10.30.3 +@@ -123,4 +123,12 @@ double drand48(void); */ int statMemoryAccounted(void); @@ -2020,10 +2020,10 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/cf.data.pre,v retrieving revision 1.49.2.86 -retrieving revision 1.49.2.33.2.33 -diff -p -u -b -r1.49.2.86 -r1.49.2.33.2.33 +retrieving revision 1.49.2.33.2.34 +diff -p -u -b -r1.49.2.86 -r1.49.2.33.2.34 --- src/cf.data.pre 26 Feb 2006 03:13:57 -0000 1.49.2.86 -+++ src/cf.data.pre 16 Feb 2006 17:21:45 -0000 1.49.2.33.2.33 ++++ src/cf.data.pre 16 May 2006 17:56:57 -0000 1.49.2.33.2.34 @@ -2397,7 +2397,6 @@ DOC_START ensure correct results it is best to set server_persisten_connections to off when using this directive in such configurations. @@ -2248,10 +2248,10 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/client_side.c,v retrieving revision 1.47.2.76 -retrieving revision 1.47.2.28.2.40 -diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.40 +retrieving revision 1.47.2.28.2.41 +diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.41 --- src/client_side.c 11 Mar 2006 03:16:31 -0000 1.47.2.76 -+++ src/client_side.c 6 Dec 2005 21:53:44 -0000 1.47.2.28.2.40 ++++ src/client_side.c 16 May 2006 17:56:58 -0000 1.47.2.28.2.41 @@ -109,7 +109,7 @@ static const char *const crlf = "\r\n"; static CWCB clientWriteComplete; static CWCB clientWriteBodyComplete; @@ -2301,7 +2301,7 @@ #if HEADERS_LOG headersLog(0, 1, request->method, request); #endif -@@ -931,11 +938,22 @@ httpRequestFree(void *data) +@@ -936,11 +943,22 @@ httpRequestFree(void *data) *H = http->next; http->next = NULL; dlinkDelete(&http->active, &ClientActiveRequests); @@ -2325,7 +2325,7 @@ connStateFree(int fd, void *data) { ConnStateData *connState = data; -@@ -963,7 +976,6 @@ connStateFree(int fd, void *data) +@@ -963,7 +981,6 @@ connStateFree(int fd, void *data) } else safe_free(connState->in.buf); /* XXX account connState->in.buf */ @@ -2333,7 +2333,7 @@ cbdataFree(connState); #ifdef _SQUID_LINUX_ /* prevent those nasty RST packets */ -@@ -1108,7 +1120,7 @@ clientSetKeepaliveFlag(clientHttpRequest +@@ -1108,7 +1125,7 @@ clientSetKeepaliveFlag(clientHttpRequest } } @@ -2342,7 +2342,7 @@ clientCheckContentLength(request_t * r) { switch (r->method) { -@@ -1127,7 +1139,7 @@ clientCheckContentLength(request_t * r) +@@ -1127,7 +1144,7 @@ clientCheckContentLength(request_t * r) /* NOT REACHED */ } @@ -2351,7 +2351,7 @@ clientCachable(clientHttpRequest * http) { request_t *req = http->request; -@@ -1153,7 +1165,7 @@ clientCachable(clientHttpRequest * http) +@@ -1153,7 +1170,7 @@ clientCachable(clientHttpRequest * http) } /* Return true if we can query our neighbors for this object */ @@ -2360,7 +2360,7 @@ clientHierarchical(clientHttpRequest * http) { const char *url = http->uri; -@@ -2439,7 +2456,7 @@ clientProcessRequest2(clientHttpRequest +@@ -2447,7 +2464,7 @@ clientProcessRequest2(clientHttpRequest return LOG_TCP_HIT; } @@ -2369,7 +2369,7 @@ clientProcessRequest(clientHttpRequest * http) { char *url = http->uri; -@@ -2457,6 +2466,11 @@ clientProcessRequest(clientHttpRequest * +@@ -2457,6 +2474,11 @@ clientProcessRequest(clientHttpRequest * debug(33, 4) ("clientProcessRequest: %s '%s'\n", RequestMethodStr[r->method], url); @@ -2381,7 +2381,7 @@ if (r->method == METHOD_CONNECT && !http->redirect.status) { http->log_type = LOG_TCP_MISS; sslStart(http, &http->out.size, &http->al.http.code); -@@ -3001,6 +3015,20 @@ clientReadRequest(int fd, void *data) +@@ -3001,6 +3023,20 @@ clientReadRequest(int fd, void *data) (long) conn->in.offset, (long) conn->in.size); len = conn->in.size - conn->in.offset - 1; } @@ -2402,7 +2402,7 @@ statCounter.syscalls.sock.reads++; size = FD_READ_METHOD(fd, conn->in.buf + conn->in.offset, len); if (size > 0) { -@@ -3104,7 +3132,8 @@ clientReadRequest(int fd, void *data) +@@ -3104,7 +3140,8 @@ clientReadRequest(int fd, void *data) /* add to the client request queue */ for (H = &conn->chr; *H; H = &(*H)->next); *H = http; @@ -2412,7 +2412,7 @@ /* * I wanted to lock 'http' here since its callback data for * clientLifetimeTimeout(), but there's no logical place to -@@ -3274,7 +3303,7 @@ clientReadRequest(int fd, void *data) +@@ -3274,7 +3311,7 @@ clientReadRequest(int fd, void *data) } /* file_read like function, for reading body content */ @@ -2421,7 +2421,7 @@ clientReadBody(request_t * request, char *buf, size_t size, CBCB * callback, void *cbdata) { ConnStateData *conn = request->body_reader_data; -@@ -3398,7 +3427,7 @@ clientProcessBody(ConnStateData * conn) +@@ -3398,7 +3435,7 @@ clientProcessBody(ConnStateData * conn) } /* Abort a body request */ @@ -2430,7 +2430,7 @@ clientAbortBody(request_t * request) { ConnStateData *conn = request->body_reader_data; -@@ -3432,7 +3469,7 @@ requestTimeout(int fd, void *data) +@@ -3440,7 +3477,7 @@ requestTimeout(int fd, void *data) * Some data has been sent to the client, just close the FD */ comm_close(fd); @@ -2439,7 +2439,7 @@ /* * assume its a persistent connection; just close it */ -@@ -3956,3 +3985,49 @@ varyEvaluateMatch(StoreEntry * entry, re +@@ -3956,3 +3993,49 @@ varyEvaluateMatch(StoreEntry * entry, re } } } @@ -2635,13 +2635,13 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/forward.c,v retrieving revision 1.13.6.16 -retrieving revision 1.13.6.3.2.15 -diff -p -u -b -r1.13.6.16 -r1.13.6.3.2.15 +retrieving revision 1.13.6.3.2.16 +diff -p -u -b -r1.13.6.16 -r1.13.6.3.2.16 --- src/forward.c 11 Mar 2006 03:16:31 -0000 1.13.6.16 -+++ src/forward.c 30 Nov 2005 21:52:15 -0000 1.13.6.3.2.15 -@@ -262,7 +262,8 @@ fwdConnectDone(int server_fd, int status - else - hierarchyNote(&fwdState->request->hier, fs->code, request->host); ++++ src/forward.c 16 May 2006 17:56:58 -0000 1.13.6.3.2.16 +@@ -251,7 +251,8 @@ fwdConnectDone(int server_fd, int status + } else { + debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, storeUrl(fwdState->entry)); fd_note(server_fd, storeUrl(fwdState->entry)); - fd_table[server_fd].uses++; + fd_table[server_fd].pconn.uses++; @@ -2649,7 +2649,7 @@ if (fs->peer) peerConnectSucceded(fs->peer); fwdDispatch(fwdState); -@@ -704,6 +705,8 @@ fwdCheckDeferRead(int fd, void *data) +@@ -700,6 +701,8 @@ fwdCheckDeferRead(int fd, void *data) void fwdFail(FwdState * fwdState, ErrorState * errorState) { @@ -2658,7 +2658,7 @@ debug(17, 3) ("fwdFail: %s \"%s\"\n\t%s\n", err_type_str[errorState->type], httpStatusString(errorState->http_status), -@@ -742,6 +745,8 @@ fwdPeerClosed(int fd, void *data) +@@ -738,6 +741,8 @@ fwdPeerClosed(int fd, void *data) void fwdUnregister(int fd, FwdState * fwdState) { @@ -2667,7 +2667,7 @@ debug(17, 3) ("fwdUnregister: %s\n", storeUrl(fwdState->entry)); assert(fd == fwdState->server_fd); assert(fd > -1); -@@ -758,7 +763,10 @@ fwdUnregister(int fd, FwdState * fwdStat +@@ -754,7 +759,10 @@ fwdUnregister(int fd, FwdState * fwdStat void fwdComplete(FwdState * fwdState) { @@ -6646,10 +6646,10 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/protos.h,v retrieving revision 1.41.6.34 -retrieving revision 1.41.6.13.2.38 -diff -p -u -b -r1.41.6.34 -r1.41.6.13.2.38 +retrieving revision 1.41.6.13.2.39 +diff -p -u -b -r1.41.6.34 -r1.41.6.13.2.39 --- src/protos.h 26 Feb 2006 03:13:57 -0000 1.41.6.34 -+++ src/protos.h 16 Feb 2006 17:21:45 -0000 1.41.6.13.2.38 ++++ src/protos.h 16 May 2006 17:56:59 -0000 1.41.6.13.2.39 @@ -292,6 +292,8 @@ extern void whoisStart(FwdState *); /* http.c */ extern int httpCachable(method_t); @@ -6725,10 +6725,10 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/squid.h,v retrieving revision 1.13.6.9 -retrieving revision 1.13.6.6.2.11 -diff -p -u -b -r1.13.6.9 -r1.13.6.6.2.11 +retrieving revision 1.13.6.6.2.12 +diff -p -u -b -r1.13.6.9 -r1.13.6.6.2.12 --- src/squid.h 11 Mar 2006 03:16:31 -0000 1.13.6.9 -+++ src/squid.h 15 May 2005 20:10:33 -0000 1.13.6.6.2.11 ++++ src/squid.h 16 May 2006 17:56:59 -0000 1.13.6.6.2.12 @@ -38,6 +38,14 @@ #include "config.h" @@ -6827,10 +6827,10 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/structs.h,v retrieving revision 1.48.2.46 -retrieving revision 1.48.2.9.2.49 -diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.49 +retrieving revision 1.48.2.9.2.50 +diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.50 --- src/structs.h 11 Mar 2006 03:16:31 -0000 1.48.2.46 -+++ src/structs.h 16 Feb 2006 17:21:45 -0000 1.48.2.9.2.49 ++++ src/structs.h 16 May 2006 17:56:59 -0000 1.48.2.9.2.50 @@ -384,6 +384,23 @@ struct _RemovalPolicySettings { wordlist *args; }; @@ -6855,7 +6855,7 @@ struct _SquidConfig { struct { squid_off_t maxSize; -@@ -714,6 +730,9 @@ struct _SquidConfig { +@@ -715,6 +732,9 @@ struct _SquidConfig { char *store_dir_select_algorithm; int sleep_after_fork; /* microseconds */ external_acl *externalAclHelperList; @@ -6865,7 +6865,7 @@ }; struct _SquidConfig2 { -@@ -788,7 +807,10 @@ struct _fde { +@@ -788,7 +808,10 @@ struct _fde { } flags; squid_off_t bytes_read; squid_off_t bytes_written; @@ -6877,7 +6877,7 @@ struct _fde_disk { DWCB *wrt_handle; void *wrt_handle_data; -@@ -983,6 +1005,131 @@ struct _http_state_flags { +@@ -983,6 +1006,131 @@ struct _http_state_flags { unsigned int request_sent:1; }; @@ -7009,7 +7009,7 @@ struct _HttpStateData { StoreEntry *entry; request_t *request; -@@ -994,10 +1141,14 @@ struct _HttpStateData { +@@ -994,10 +1142,14 @@ struct _HttpStateData { int fd; http_state_flags flags; FwdState *fwd; @@ -7024,7 +7024,7 @@ struct _icpUdpData { struct sockaddr_in address; void *msg; -@@ -1092,6 +1242,7 @@ struct _clientHttpRequest { +@@ -1099,6 +1251,7 @@ struct _clientHttpRequest { unsigned int internal:1; unsigned int done_copying:1; unsigned int purging:1; @@ -7032,7 +7032,7 @@ unsigned int hit:1; } flags; struct { -@@ -1107,6 +1253,9 @@ struct _clientHttpRequest { +@@ -1107,6 +1260,9 @@ struct _clientHttpRequest { } redirect; dlink_node active; squid_off_t maxBodySize; @@ -7042,7 +7042,7 @@ }; struct _ConnStateData { -@@ -1134,7 +1283,6 @@ struct _ConnStateData { +@@ -1134,7 +1290,6 @@ struct _ConnStateData { struct sockaddr_in me; struct in_addr log_addr; char rfc931[USER_IDENT_SZ]; @@ -7050,7 +7050,7 @@ struct { int n; time_t until; -@@ -1685,6 +1833,9 @@ struct _request_t { +@@ -1685,6 +1840,9 @@ struct _request_t { char *peer_login; /* Configured peer login:password */ time_t lastmod; /* Used on refreshes */ const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */ @@ -7060,7 +7060,7 @@ BODY_HANDLER *body_reader; void *body_reader_data; }; -@@ -1784,7 +1940,11 @@ struct _StatCounters { +@@ -1790,7 +1948,11 @@ struct _StatCounters { kb_t kbytes_in; kb_t kbytes_out; } all , http, ftp, other; @@ -7101,10 +7101,7 @@ =================================================================== RCS file: /cvsroot/squid/squid/src/url.c,v retrieving revision 1.7.6.7 -retrieving revision 1.7.6.5.2.2 -diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.2 --- src/url.c 11 Mar 2006 03:16:31 -0000 1.7.6.7 -+++ src/url.c 23 Nov 2005 20:38:56 -0000 1.7.6.5.2.2 @@ -103,6 +103,9 @@ const char *ProtocolStr[] = "whois", "internal", Index: files/customlog-2.5.patch =================================================================== --- files/customlog-2.5.patch (.../www/squid) (revision 837) +++ files/customlog-2.5.patch (.../local/squid) (revision 837) @@ -2,9 +2,9 @@ ! Modified diff paths to apply cleanly Index: src/access_log.c -diff -u src/access_log.c:1.15.6.8 src/access_log.c:1.15.6.3.2.14 +diff -u src/access_log.c:1.15.6.8 src/access_log.c:1.15.6.3.2.15 --- src/access_log.c:1.15.6.8 Tue Mar 29 18:17:46 2005 -+++ src/access_log.c Thu Sep 1 12:28:46 2005 ++++ src/access_log.c Mon May 15 03:58:22 2006 @@ -36,9 +36,6 @@ #include "squid.h" @@ -522,7 +522,7 @@ + lt->type = LFT_STRING; + lt->data.string = cp; + while (l > 0) { -+ switch(*cur) { ++ switch (*cur) { + case '"': + if (*quote == LOG_QUOTE_NONE) + *quote = LOG_QUOTE_QUOTES; @@ -530,11 +530,11 @@ + *quote = LOG_QUOTE_NONE; + break; + case '[': -+ if (*quote == LOG_QUOTE_NONE) ++ if (*quote == LOG_QUOTE_NONE) + *quote = LOG_QUOTE_BRAKETS; + break; + case ']': -+ if (*quote == LOG_QUOTE_BRAKETS) ++ if (*quote == LOG_QUOTE_BRAKETS) + *quote = LOG_QUOTE_NONE; + break; + } @@ -564,7 +564,7 @@ + cur++; + break; + default: -+ lt->quote = *quote; ++ lt->quote = *quote; + break; + } + if (*cur == '-') { @@ -621,14 +621,14 @@ + lt->data.header.separator = ','; + lt->data.header.element = cp; + lt->type = (lt->type == LFT_REQUEST_HEADER) ? -+ LFT_REQUEST_HEADER_ELEM : -+ LFT_REPLY_HEADER_ELEM; ++ LFT_REQUEST_HEADER_ELEM : ++ LFT_REPLY_HEADER_ELEM; + } + lt->data.header.header = header; + } else { + lt->type = (lt->type == LFT_REQUEST_HEADER) ? -+ LFT_REQUEST_ALL_HEADERS : -+ LFT_REPLY_ALL_HEADERS; ++ LFT_REQUEST_ALL_HEADERS : ++ LFT_REPLY_ALL_HEADERS; + Config.onoff.log_mime_hdrs = 1; + } + break; @@ -710,15 +710,15 @@ + + arg = argbuf; + type = (type == LFT_REQUEST_HEADER_ELEM) ? -+ LFT_REQUEST_HEADER : -+ LFT_REPLY_HEADER; ++ LFT_REQUEST_HEADER : ++ LFT_REPLY_HEADER; + break; + + case LFT_REQUEST_ALL_HEADERS: + case LFT_REPLY_ALL_HEADERS: + type = (type == LFT_REQUEST_ALL_HEADERS) ? -+ LFT_REQUEST_HEADER : -+ LFT_REPLY_HEADER; ++ LFT_REQUEST_HEADER : ++ LFT_REPLY_HEADER; + break; + + default: @@ -876,7 +876,7 @@ } - logfileFlush(logfile); + last: -+ (void)0; /* NULL statement for label */ ++ (void) 0; /* NULL statement for label */ + #if MULTICAST_MISS_STREAM if (al->cache.code != LOG_TCP_MISS) @@ -938,9 +938,9 @@ headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0); assert(NULL != headerslog); Index: src/cache_cf.c -diff -u src/cache_cf.c:1.38.6.24 src/cache_cf.c:1.38.6.11.4.9 ---- src/cache_cf.c:1.38.6.24 Fri May 6 19:15:36 2005 -+++ src/cache_cf.c Thu May 26 21:34:13 2005 +diff -u src/cache_cf.c:1.38.6.29 src/cache_cf.c:1.38.6.11.4.10 +--- src/cache_cf.c:1.38.6.29 Wed Oct 26 19:13:24 2005 ++++ src/cache_cf.c Fri Mar 3 18:27:50 2006 @@ -60,6 +60,14 @@ static void dump_cachedir_option_readonly(StoreEntry * e, const char *option, SwapDir * sd); static void parse_cachedir_option_maxsize(SwapDir * sd, const char *option, const char *value, int reconfiguring); @@ -956,7 +956,7 @@ static struct cache_dir_option common_cachedir_options[] = { {"read-only", parse_cachedir_option_readonly, dump_cachedir_option_readonly}, -@@ -2631,3 +2639,144 @@ +@@ -2625,3 +2633,144 @@ return t; } } @@ -1102,10 +1102,10 @@ + } +} Index: src/cf.data.pre -diff -u src/cf.data.pre:1.49.2.77 src/cf.data.pre:1.49.2.40.2.17 ---- src/cf.data.pre:1.49.2.77 Tue May 10 19:17:53 2005 -+++ src/cf.data.pre Thu Sep 1 12:28:46 2005 -@@ -833,16 +833,97 @@ +diff -u src/cf.data.pre:1.49.2.86 src/cf.data.pre:1.49.2.40.2.18 +--- src/cf.data.pre:1.49.2.86 Sat Feb 25 19:13:57 2006 ++++ src/cf.data.pre Fri Mar 3 18:27:50 2006 +@@ -834,16 +834,97 @@ (hard coded at 1 MB). DOC_END @@ -1211,7 +1211,7 @@ NAME: cache_log TYPE: string -@@ -2429,6 +2510,17 @@ +@@ -2440,6 +2521,17 @@ no limit imposed. DOC_END @@ -1230,8 +1230,9 @@ ADMINISTRATIVE PARAMETERS ----------------------------------------------------------------------------- Index: src/client_side.c ---- src/client_side.c.orig Fri Mar 10 23:58:35 2006 -+++ src/client_side.c Sat Mar 18 23:53:25 2006 +diff -u src/client_side.c:1.47.2.76 src/client_side.c:1.47.2.31.2.15 +--- src/client_side.c:1.47.2.76 Fri Mar 10 19:16:31 2006 ++++ src/client_side.c Mon Apr 24 08:22:33 2006 @@ -871,14 +871,18 @@ http->al.cache.code = http->log_type; http->al.cache.msec = tvSubMsec(http->start, current_time); @@ -1320,10 +1321,86 @@ void Index: src/logfile.c -diff -u src/logfile.c:1.5.38.3 src/logfile.c:1.5.38.3.4.1 +diff -u src/logfile.c:1.5.38.3 src/logfile.c:1.5.38.3.4.4 --- src/logfile.c:1.5.38.3 Mon Jan 20 19:15:11 2003 -+++ src/logfile.c Wed Mar 2 12:50:03 2005 -@@ -39,33 +39,38 @@ ++++ src/logfile.c Sun May 21 16:56:52 2006 +@@ -36,36 +36,127 @@ + + static void logfileWriteWrapper(Logfile * lf, const void *buf, size_t len); + ++#if HAVE_SYSLOG ++typedef struct { ++ const char *name; ++ int value; ++}syslog_symbol_t; ++ ++static int ++syslog_ntoa(const char *s) ++{ ++#define syslog_symbol(a) #a, a ++ static syslog_symbol_t symbols[] = ++ { ++#ifdef LOG_AUTHPRIV ++ {syslog_symbol(LOG_AUTHPRIV)}, ++#endif ++#ifdef LOG_DAEMON ++ {syslog_symbol(LOG_DAEMON)}, ++#endif ++#ifdef LOG_LOCAL0 ++ {syslog_symbol(LOG_LOCAL0)}, ++#endif ++#ifdef LOG_LOCAL1 ++ {syslog_symbol(LOG_LOCAL1)}, ++#endif ++#ifdef LOG_LOCAL2 ++ {syslog_symbol(LOG_LOCAL2)}, ++#endif ++#ifdef LOG_LOCAL3 ++ {syslog_symbol(LOG_LOCAL3)}, ++#endif ++#ifdef LOG_LOCAL4 ++ {syslog_symbol(LOG_LOCAL4)}, ++#endif ++#ifdef LOG_LOCAL5 ++ {syslog_symbol(LOG_LOCAL5)}, ++#endif ++#ifdef LOG_LOCAL6 ++ {syslog_symbol(LOG_LOCAL6)}, ++#endif ++#ifdef LOG_LOCAL7 ++ {syslog_symbol(LOG_LOCAL7)}, ++#endif ++#ifdef LOG_USER ++ {syslog_symbol(LOG_USER)}, ++#endif ++#ifdef LOG_ERR ++ {syslog_symbol(LOG_ERR)}, ++#endif ++#ifdef LOG_WARNING ++ {syslog_symbol(LOG_WARNING)}, ++#endif ++#ifdef LOG_NOTICE ++ {syslog_symbol(LOG_NOTICE)}, ++#endif ++#ifdef LOG_INFO ++ {syslog_symbol(LOG_INFO)}, ++#endif ++#ifdef LOG_DEBUG ++ {syslog_symbol(LOG_DEBUG)}, ++#endif ++ {NULL, 0} ++ }; ++ syslog_symbol_t *p; ++ ++ for (p = symbols; p->name != NULL; ++p) ++ if (!strcmp(s, p->name) || !strcmp(s, p->name + 4)) ++ return p->value; ++ return 0; ++} ++ ++#define PRIORITY_MASK (LOG_ERR | LOG_WARNING | LOG_NOTICE | LOG_INFO | LOG_DEBUG) ++#endif /* HAVE_SYSLOG */ ++ Logfile * logfileOpen(const char *path, size_t bufsz, int fatal_flag) { @@ -1345,11 +1422,24 @@ - return NULL; + Logfile *lf = xcalloc(1, sizeof(*lf)); + xstrncpy(lf->path, path, MAXPATHLEN); -+ if (strcmp(path, "syslog") == 0) { ++#if HAVE_SYSLOG ++ if (strcmp(path, "syslog") == 0 || strncmp(path, "syslog:", 7) == 0) { + lf->flags.syslog = 1; -+ lf->syslog_priority = LOG_INFO; + lf->fd = -1; -+ } else { ++ if (path[6] != '\0') { ++ const char *priority = path + 7; ++ char *facility = strchr(priority, '|'); ++ if (facility) { ++ *facility++ = '\0'; ++ lf->syslog_priority |= syslog_ntoa(facility); ++ } ++ lf->syslog_priority |= syslog_ntoa(priority); ++ } ++ if ((lf->syslog_priority & PRIORITY_MASK) == 0) ++ lf->syslog_priority |= LOG_INFO; ++ } else ++#endif ++ { + int fd = file_open(path, O_WRONLY | O_CREAT | O_TEXT); + if (DISK_ERROR == fd) { + if (ENOENT == errno && fatal_flag) { @@ -1385,7 +1475,7 @@ return lf; } -@@ -73,7 +78,8 @@ +@@ -73,7 +164,8 @@ logfileClose(Logfile * lf) { logfileFlush(lf); @@ -1395,7 +1485,7 @@ if (lf->buf) xfree(lf->buf); xfree(lf); -@@ -89,6 +95,8 @@ +@@ -89,6 +181,8 @@ char from[MAXPATHLEN]; char to[MAXPATHLEN]; assert(lf->path); @@ -1404,21 +1494,23 @@ #ifdef S_ISREG if (stat(lf->path, &sb) == 0) if (S_ISREG(sb.st_mode) == 0) -@@ -120,6 +128,10 @@ +@@ -120,6 +214,12 @@ void logfileWrite(Logfile * lf, void *buf, size_t len) { ++#if HAVE_SYSLOG + if (lf->flags.syslog) { -+ syslog(lf->syslog_priority, "%s", (char *)buf); ++ syslog(lf->syslog_priority, "%s", (char *) buf); + return; + } ++#endif if (0 == lf->bufsz) { /* buffering disabled */ logfileWriteWrapper(lf, buf, len); Index: src/protos.h -diff -u src/protos.h:1.41.6.30 src/protos.h:1.41.6.14.2.9 ---- src/protos.h:1.41.6.30 Wed May 18 19:14:37 2005 -+++ src/protos.h Thu May 26 21:34:15 2005 +diff -u src/protos.h:1.41.6.34 src/protos.h:1.41.6.14.2.10 +--- src/protos.h:1.41.6.34 Sat Feb 25 19:13:57 2006 ++++ src/protos.h Fri Mar 3 18:27:52 2006 @@ -34,11 +34,14 @@ #ifndef SQUID_PROTOS_H #define SQUID_PROTOS_H @@ -1436,9 +1528,9 @@ #if FORW_VIA_DB extern void fvdbCountVia(const char *key); Index: src/structs.h -diff -u src/structs.h:1.48.2.39 src/structs.h:1.48.2.11.2.12 ---- src/structs.h:1.48.2.39 Wed May 4 19:18:43 2005 -+++ src/structs.h Thu May 26 21:34:16 2005 +diff -u src/structs.h:1.48.2.46 src/structs.h:1.48.2.11.2.14 +--- src/structs.h:1.48.2.46 Fri Mar 10 19:16:31 2006 ++++ src/structs.h Mon Apr 24 08:22:34 2006 @@ -465,7 +465,6 @@ char *as_whois_server; struct { @@ -1456,7 +1548,7 @@ int rotateNumber; } Log; char *adminEmail; -@@ -619,6 +620,7 @@ +@@ -623,6 +624,7 @@ acl_access *AlwaysDirect; acl_access *ASlists; acl_access *noCache; @@ -1464,7 +1556,7 @@ #if SQUID_SNMP acl_access *snmp; #endif -@@ -1057,6 +1059,8 @@ +@@ -1061,6 +1063,8 @@ const char *method_str; } private; HierarchyLogEntry hier; @@ -1473,7 +1565,7 @@ }; struct _clientHttpRequest { -@@ -2200,8 +2204,32 @@ +@@ -2210,8 +2214,32 @@ size_t bufsz; ssize_t offset; struct { >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605221241.k4MCfOY2065520>