Attachment #85831 for bug #122133

View | Details | Raw Unified | Return to bug 122133
Collapse All | Expand All

Lines 63-68 Link Here

(-)Makefile (+1 lines)
63		63
64	PORTNAME= squid	64	PORTNAME= squid
65	PORTVERSION= 3.0.2	65	PORTVERSION= 3.0.2
		66	PORTREVISION= 1
66	CATEGORIES= www	67	CATEGORIES= www
67	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	68	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
68	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \	69	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \




LDFLAGS gets unset when --with-filedescriptors=n is added to
SQUID_CONFIGURE_ARGS.

--- configure.orig	2008-03-26 21:16:54.000000000 +0100
+++ configure	2008-03-26 21:18:40.000000000 +0100
@@ -43819,12 +43819,12 @@
   esac
   { echo "$as_me:$LINENO: result: $SQUID_MAXFD" >&5
 echo "${ECHO_T}$SQUID_MAXFD" >&6; }
+  LDFLAGS="$TLDFLAGS"
 fi
 
 { echo "$as_me:$LINENO: checking Maximum number of filedescriptors we can open" >&5
 echo $ECHO_N "checking Maximum number of filedescriptors we can open... $ECHO_C" >&6; }
+TLDFLAGS="$LDFLAGS"
 if test -n "$squid_filedescriptors_num" ; then
   SQUID_MAXFD=$squid_filedescriptors_num
   { echo "$as_me:$LINENO: result: $SQUID_MAXFD (user-forced)" >&5
 echo "${ECHO_T}$SQUID_MAXFD (user-forced)" >&6; }
 else
-  TLDFLAGS="$LDFLAGS"
   case $host in
   i386-unknown-freebsd*)
       if echo "$LDFLAGS" | grep -q pthread; then




Temporary patch for Squid bug 2206 ("no proxy Authenticate header in 407
response") as fetched from Squid bugzilla 2008-03-26.

See <http://www.squid-cache.org/bugs/show_bug_cgi?id=2206> for further
information.
=== modified file 'src/HttpHeader.cc'
--- src/HttpHeader.cc	2008-02-27 12:59:29 +0000
+++ src/HttpHeader.cc	2008-03-12 20:53:15 +0000
@@ -1806,5 +1806,7 @@
         }
         if (headers_deleted)
             refreshMask();
+
+        delById(HDR_CONNECTION);
     }
 }

=== modified file 'src/HttpHeader.h'
--- src/HttpHeader.h	2008-02-27 12:59:29 +0000
+++ src/HttpHeader.h	2008-03-12 20:53:56 +0000
@@ -247,15 +247,13 @@
     int hasListMember(http_hdr_type id, const char *member, const char separator) const;
     int hasByNameListMember(const char *name, const char *member, const char separator) const;
     void removeHopByHopEntries();
+    void removeConnectionHeaderEntries();
     /* protected, do not use these, use interface functions instead */
     Vector<HttpHeaderEntry *> entries;		/* parsed fields in raw format */
     HttpHeaderMask mask;	/* bit set <=> entry present */
     http_hdr_owner_type owner;	/* request or reply */
     int len;			/* length when packed, not counting terminating '\0' */
 
-protected:
-    void removeConnectionHeaderEntries();
-    
 private:
     HttpHeaderEntry *findLastEntry(http_hdr_type id) const;
     // Make it non-copyable. Our destructor is a bit nasty...

=== modified file 'src/client_side_reply.cc'
--- src/client_side_reply.cc	2008-02-27 12:59:29 +0000
+++ src/client_side_reply.cc	2008-03-12 20:54:37 +0000
@@ -1214,7 +1214,7 @@
     if (is_hit)
         hdr->delById(HDR_SET_COOKIE);
 
-    reply->header.removeHopByHopEntries();
+    reply->header.removeConnectionHeaderEntries();
 
     //    if (request->range)
     //      clientBuildRangeHeader(http, reply);

Return to bug 122133

Lines 3-23 Link Here

(-)files/patch-configure (-17 / +15 lines)
3	LDFLAGS gets unset when --with-filedescriptors=n is added to	3	LDFLAGS gets unset when --with-filedescriptors=n is added to
4	SQUID_CONFIGURE_ARGS.	4	SQUID_CONFIGURE_ARGS.
5		5
6	--- configure.orig Fri Dec 14 01:25:27 2007	6	--- configure.orig 2008-03-26 21:16:54.000000000 +0100
7	+++ configure Thu Jan 24 19:56:32 2008	7	+++ configure 2008-03-26 21:18:40.000000000 +0100
8	@@ -43934,6 +43934,7 @@	8	@@ -43819,12 +43819,12 @@
9	esac
10	{ echo "$as_me:$LINENO: result: $SQUID_MAXFD" >&5
11	echo "${ECHO_T}$SQUID_MAXFD" >&6; }
12	+ LDFLAGS="$TLDFLAGS"
13	fi
14		9
15	cat >>confdefs.h <<_ACEOF	10	{ echo "$as_me:$LINENO: checking Maximum number of filedescriptors we can open" >&5
16	@@ -43947,7 +43948,6 @@	11	echo $ECHO_N "checking Maximum number of filedescriptors we can open... $ECHO_C" >&6; }
17	echo " on how to increase your filedescriptor limit"	12	+TLDFLAGS="$LDFLAGS"
18	sleep 10	13	if test -n "$squid_filedescriptors_num" ; then
19	fi	14	SQUID_MAXFD=$squid_filedescriptors_num
20	-LDFLAGS="$TLDFLAGS"	15	{ echo "$as_me:$LINENO: result: $SQUID_MAXFD (user-forced)" >&5
21		16	echo "${ECHO_T}$SQUID_MAXFD (user-forced)" >&6; }
22	if test `expr $SQUID_MAXFD % 64` != 0; then	17	else
23	echo "WARNING: $SQUID_MAXFD is not an multiple of 64. This may cause issues"	18	- TLDFLAGS="$LDFLAGS"
		19	case $host in
		20	i386-unknown-freebsd*)
		21	if echo "$LDFLAGS" \| grep -q pthread; then

Line 0 Link Here

(-)files/patch-bug-2206 (+50 lines)
	1	Temporary patch for Squid bug 2206 ("no proxy Authenticate header in 407
	2	response") as fetched from Squid bugzilla 2008-03-26.
	3
	4	See <http://www.squid-cache.org/bugs/show_bug_cgi?id=2206> for further
	5	information.
	6	=== modified file 'src/HttpHeader.cc'
	7	--- src/HttpHeader.cc 2008-02-27 12:59:29 +0000
	8	+++ src/HttpHeader.cc 2008-03-12 20:53:15 +0000
	9	@@ -1806,5 +1806,7 @@
	10	}
	11	if (headers_deleted)
	12	refreshMask();
	13	+
	14	+ delById(HDR_CONNECTION);
	15	}
	16	}
	17
	18	=== modified file 'src/HttpHeader.h'
	19	--- src/HttpHeader.h 2008-02-27 12:59:29 +0000
	20	+++ src/HttpHeader.h 2008-03-12 20:53:56 +0000
	21	@@ -247,15 +247,13 @@
	22	int hasListMember(http_hdr_type id, const char *member, const char separator) const;
	23	int hasByNameListMember(const char name, const char member, const char separator) const;
	24	void removeHopByHopEntries();
	25	+ void removeConnectionHeaderEntries();
	26	/* protected, do not use these, use interface functions instead */
	27	Vector<HttpHeaderEntry > entries; / parsed fields in raw format */
	28	HttpHeaderMask mask; /* bit set <=> entry present */
	29	http_hdr_owner_type owner; /* request or reply */
	30	int len; /* length when packed, not counting terminating '\0' */
	31
	32	-protected:
	33	- void removeConnectionHeaderEntries();
	34	-
	35	private:
	36	HttpHeaderEntry *findLastEntry(http_hdr_type id) const;
	37	// Make it non-copyable. Our destructor is a bit nasty...
	38
	39	=== modified file 'src/client_side_reply.cc'
	40	--- src/client_side_reply.cc 2008-02-27 12:59:29 +0000
	41	+++ src/client_side_reply.cc 2008-03-12 20:54:37 +0000
	42	@@ -1214,7 +1214,7 @@
	43	if (is_hit)
	44	hdr->delById(HDR_SET_COOKIE);
	45
	46	- reply->header.removeHopByHopEntries();
	47	+ reply->header.removeConnectionHeaderEntries();
	48
	49	// if (request->range)
	50	// clientBuildRangeHeader(http, reply);