From 1c148b2c601bc282f8d6c3d508e296a936df1e60 Mon Sep 17 00:00:00 2001 From: leeym Date: Mon, 18 Apr 2005 07:09:02 +0000 Subject: - the patch is repacked at 2005-04-18 00:57, after maintainer submit PR 80028 - diff is listed below: --- /tmp/squid-2.5.STABLE9-2GB.patch Mon Apr 4 17:09:16 2005 +++ /usr/ports/distfiles/squid2.5/squid-2.5.STABLE9-2GB.patch Mon Apr 18 08:57:57 2005 @@ -3000,7 +3000,7 @@ } /* there are some things we cannot do yet */ Index: squid/src/protos.h -diff -c squid/src/protos.h:1.420.2.28 squid/src/protos.h:1.420.2.32 +diff -c squid/src/protos.h:1.420.2.28 squid/src/protos.h:1.420.2.30 *** squid/src/protos.h:1.420.2.28 Fri Mar 18 17:01:52 2005 --- squid/src/protos.h Sat Mar 26 10:36:01 2005 *************** @@ -3455,9 +3455,9 @@ + #endif /* SQUID_H */ Index: squid/src/ssl.c -diff -c squid/src/ssl.c:1.118.2.9 squid/src/ssl.c:1.118.2.10 +diff -c squid/src/ssl.c:1.118.2.9 squid/src/ssl.c:1.118.2.11 *** squid/src/ssl.c:1.118.2.9 Mon Mar 21 12:39:29 2005 ---- squid/src/ssl.c Fri Mar 25 19:50:53 2005 +--- squid/src/ssl.c Sun Apr 17 18:54:30 2005 *************** *** 46,52 **** int len; @@ -3482,7 +3482,7 @@ kb_incr(&statCounter.server.all.kbytes_out, len); kb_incr(&statCounter.server.other.kbytes_out, len); + /* increment total object size */ -+ if (sslState->size_ptr) ++ if (sslState->size_ptr && sslState->client.fd != -1) + #if SIZEOF_SQUID_OFF_T <= 4 + if (*sslState->size_ptr < 0x7FFF0000) + #endif Noticed by: many people ... --- www/squid31/distinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/squid31') diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 0d8825dbac7e..11375a0a7b26 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -38,8 +38,8 @@ MD5 (squid2.5/squid-2.5.STABLE9-disable_hostname_checks.patch) = dc3eb6e50a1c5e5 SIZE (squid2.5/squid-2.5.STABLE9-disable_hostname_checks.patch) = 2964 MD5 (squid2.5/squid-2.5.STABLE9-aufs_shutdown.patch) = 2ab5c4eaa70d5236c867a68834e1ff4d SIZE (squid2.5/squid-2.5.STABLE9-aufs_shutdown.patch) = 10649 -MD5 (squid2.5/squid-2.5.STABLE9-2GB.patch) = 5b77c60d1801bce9591744ba5690699a -SIZE (squid2.5/squid-2.5.STABLE9-2GB.patch) = 250589 +MD5 (squid2.5/squid-2.5.STABLE9-2GB.patch) = 69eb56cb148ae1d75ef5ae0371037465 +SIZE (squid2.5/squid-2.5.STABLE9-2GB.patch) = 250618 MD5 (squid2.5/squid-2.5.STABLE9-cachemgr_objects.patch) = cc3c6c61b46f50ea93271997e3002349 SIZE (squid2.5/squid-2.5.STABLE9-cachemgr_objects.patch) = 2625 MD5 (squid2.5/squid-2.5.STABLE9-extaclauth.patch) = b3c3282e6f1550e698e7a3f3ad87a7bc -- cgit