author: Martin Wilke <miwi@FreeBSD.org> 2007-12-18 18:55:45 +0000
committer: Martin Wilke <miwi@FreeBSD.org> 2007-12-18 18:55:45 +0000
commit: 300aa08dd8e31cce3c6a11bb35d51a0dfb4ae7c9 (patch)
tree: f4f6f6e0f753f3f728077ea84088f71720c001b8 /www/squid30/files
parent: d7f7d9966b467877c9b45e294519dac7b57e5487 (diff)
3 files changed, 0 insertions, 217 deletions
diff --git a/www/squid30/files/patch-errors__Armenian b/www/squid30/files/patch-errors__Armenian
deleted file mode 100644
index a420206f669e..000000000000
--- a/www/squid30/files/patch-errors__Armenian
+++ /dev/null
@@ -1,71 +0,0 @@
-Add copies of the respective English language documents to the errors/Armenian
-directory. This allows the port to install the complete set of Armenian
-language documents. This patch has been submitted as Squid bug #2094 and will
-hopefully be added to mainline Squid in the next release.
---- errors/Armenian/ERR_ESI	Thu Jan  1 01:00:00 1970
-+++ errors/Armenian/ERR_ESI	Wed Oct  3 17:07:05 2007
-@@ -0,0 +1,28 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-+<HTML><HEAD>
-+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-+<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE>
-+</HEAD><BODY>
-+<H2>The requested URL could not be retrieved</H2>
-+<HR noshade size="1px">
-+<P>
-+While trying to retrieve the URL:
-+<A HREF="%U">%U</A>
-+<P>
-+The following error was encountered:
-+<BLOCKQUOTE>
-+ESI Processing failed.
-+</BLOCKQUOTE>
-+
-+<P>
-+The ESI processor returned:
-+<BLOCKQUOTE>
-+%Z
-+</BLOCKQUOTE>
-+
-+<P>
-+This means that:
-+<PRE>
-+ The surrogate was not able to process the ESI template. Please report this error to the webmaster. 
-+</PRE>
-+<P>Your webmaster is <A HREF="mailto:%w">%w</A>. 
---- errors/Armenian/ERR_ICAP_FAILURE	Thu Jan  1 01:00:00 1970
-+++ errors/Armenian/ERR_ICAP_FAILURE	Wed Oct  3 17:07:05 2007
-@@ -0,0 +1,33 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-+<HTML><HEAD>
-+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-+<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE>
-+</HEAD><BODY>
-+<H1>ERROR</H1>
-+<H2>The requested URL could not be retrieved</H2>
-+<HR noshade size="1px">
-+<P>
-+While trying to retrieve the URL:
-+<A HREF="%U">%U</A>
-+<P>
-+The following error was encountered:
-+<UL>
-+<LI>
-+<STRONG>
-+ICAP protocol error.
-+</STRONG>
-+</UL>
-+
-+<P>
-+The system returned:
-+<PRE><I>    %E</I></PRE>
-+
-+<P>
-+This means that:
-+Some aspect of the ICAP communication failed. Possible problems:
-+<UL>
-+<LI>ICAP server is not reachable.
-+<LI>Illegal response from ICAP server.
-+</UL>
-+</P>
-+
diff --git a/www/squid30/files/patch-secfix-2007-2 b/www/squid30/files/patch-secfix-2007-2
deleted file mode 100644
index 8b190c3d249e..000000000000
--- a/www/squid30/files/patch-secfix-2007-2
+++ /dev/null
@@ -1,143 +0,0 @@
-Patch for the remote denial of service vulnerability as documented in
-Squid advisory 2007_2 (http://www.squid-cache.org/Advisories/SQUID-2007_2.txt):
-
-This is a slightly revised version of the original PatchSet 11211, with
-one hunk removed and path informations stripped in order to make it
-apply to otherwise unpatched 3.0.RC1 sources.
-
-Created: 2007-12-04 by Thomas-Martin Seck <tmseck@netcologne.de> for the
-FreeBSD port of Squid 3.0.
-
----------------------
-PatchSet 11211 
-Date: 2007/11/26 13:09:54
-Author: hno
-Branch: HEAD
-Tag: (none) 
-Log:
-pack header entries on cache updates
-
-Members: 
-	include/Array.h:1.24->1.25 
-	src/HttpHeader.cc:1.137->1.138 
-	src/HttpHeader.h:1.23->1.24 
-	src/HttpReply.cc:1.96->1.97 
-
-Index: squid3/include/Array.h
-===================================================================
-RCS file: /cvsroot/squid/squid3/include/Array.h,v
-retrieving revision 1.24
-retrieving revision 1.25
-diff -u -r1.24 -r1.25
---- include/Array.h	21 Nov 2005 22:43:41 -0000	1.24
-+++ include/Array.h	26 Nov 2007 13:09:54 -0000	1.25
-@@ -1,5 +1,5 @@
- /*
-- * $Id: Array.h,v 1.24 2005/11/21 22:43:41 wessels Exp $
-+ * $Id: Array.h,v 1.25 2007/11/26 13:09:54 hno Exp $
-  *
-  * AUTHOR: Alex Rousskov
-  *
-@@ -98,6 +98,7 @@
-     E &back();
-     E pop_back();
-     E shift();         // aka pop_front
-+    void prune(E);
-     void preAppend(int app_count);
-     bool empty() const;
-     size_t size() const;
-@@ -243,6 +244,22 @@
-     return items[size() - 1];
- }
- 
-+template<class E>
-+void
-+Vector<E>::prune(E item)
-+{
-+    unsigned int n = 0;
-+    for (unsigned int i = 0; i < count; i++) {
-+	if (items[i] != item) {
-+	    if (i != n)
-+		items[n] = items[i];
-+	    n++;
-+	}
-+    }
-+
-+    count = n;
-+}
-+
- /* if you are going to append a known and large number of items, call this first */
- template<class E>
- void
-Index: squid3/src/HttpHeader.cc
-===================================================================
-RCS file: /cvsroot/squid/squid3/src/HttpHeader.cc,v
-retrieving revision 1.137
-retrieving revision 1.138
-diff -u -r1.137 -r1.138
---- src/HttpHeader.cc	26 Nov 2007 12:31:37 -0000	1.137
-+++ src/HttpHeader.cc	26 Nov 2007 13:09:55 -0000	1.138
-@@ -787,6 +787,15 @@
- }
- 
- /*
-+ * Compacts the header storage
-+ */
-+void
-+HttpHeader::compact()
-+{
-+    entries.prune(NULL);
-+}
-+
-+/*
-  * Refreshes the header mask. Required after delAt() calls.
-  */
- void
-Index: squid3/src/HttpHeader.h
-===================================================================
-RCS file: /cvsroot/squid/squid3/src/HttpHeader.h,v
-retrieving revision 1.23
-retrieving revision 1.24
-diff -u -r1.23 -r1.24
---- src/HttpHeader.h	13 Aug 2007 17:20:51 -0000	1.23
-+++ src/HttpHeader.h	26 Nov 2007 13:09:55 -0000	1.24
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: HttpHeader.h,v 1.23 2007/08/13 17:20:51 hno Exp $
-+ * $Id: HttpHeader.h,v 1.24 2007/11/26 13:09:55 hno Exp $
-  *
-  *
-  * SQUID Web Proxy Cache          http://www.squid-cache.org/
-@@ -202,6 +202,7 @@
-     void clean();
-     void append(const HttpHeader * src);
-     void update (HttpHeader const *fresh, HttpHeaderMask const *denied_mask);
-+    void compact();
-     int reset();
-     int parse(const char *header_start, const char *header_end);
-     void packInto(Packer * p) const;
-Index: squid3/src/HttpReply.cc
-===================================================================
-RCS file: /cvsroot/squid/squid3/src/HttpReply.cc,v
-retrieving revision 1.96
-retrieving revision 1.97
-diff -u -r1.96 -r1.97
---- src/HttpReply.cc	13 Aug 2007 17:20:51 -0000	1.96
-+++ src/HttpReply.cc	26 Nov 2007 13:09:55 -0000	1.97
-@@ -1,6 +1,6 @@
- 
- /*
-- * $Id: HttpReply.cc,v 1.96 2007/08/13 17:20:51 hno Exp $
-+ * $Id: HttpReply.cc,v 1.97 2007/11/26 13:09:55 hno Exp $
-  *
-  * DEBUG: section 58    HTTP Reply (Response)
-  * AUTHOR: Alex Rousskov
-@@ -312,6 +312,7 @@
-     header.update(&freshRep->header,
-                   (const HttpHeaderMask *) &Denied304HeadersMask);
- 
-+    header.compact();
-     /* init cache */
-     hdrCacheInit();
- }
diff --git a/www/squid30/files/pkg-message.in b/www/squid30/files/pkg-message.in
index 6182fdea0f63..8a17b2772a7f 100644
--- a/www/squid30/files/pkg-message.in
+++ b/www/squid30/files/pkg-message.in
@@ -30,6 +30,3 @@
      Additionally, you should check your configuration by calling
      'squid -f /path/to/squid.conf -k parse' before starting Squid.
 
-     Keep in mind that this version of Squid is a development version and
-     is probably noticeably slower and less stable than Squid 2.
-
author	Martin Wilke <miwi@FreeBSD.org>	2007-12-18 18:55:45 +0000
committer	Martin Wilke <miwi@FreeBSD.org>	2007-12-18 18:55:45 +0000
commit	300aa08dd8e31cce3c6a11bb35d51a0dfb4ae7c9 (patch)
tree	f4f6f6e0f753f3f728077ea84088f71720c001b8 /www/squid30/files
parent	d7f7d9966b467877c9b45e294519dac7b57e5487 (diff)