diff options
author | sergei <sergei@FreeBSD.org> | 2004-10-18 21:50:20 +0000 |
---|---|---|
committer | sergei <sergei@FreeBSD.org> | 2004-10-18 21:50:20 +0000 |
commit | fdc923e3fe1dc3c5e183b66c35ba5fafd6496e54 (patch) | |
tree | 8385ed6384cd0adf3e5683a47cc1df87ef8f0cfc /www/squid30 | |
parent | bb428a03f6f41a1e7995591cc1c551b5a12e91f5 (diff) | |
download | FreeBSD-ports-fdc923e3fe1dc3c5e183b66c35ba5fafd6496e54.zip FreeBSD-ports-fdc923e3fe1dc3c5e183b66c35ba5fafd6496e54.tar.gz |
- Integrate a vendor patch that prevents squid from consuming 100%
CPU for half closed PUT/POST requests (squid bugs #354, 1096).
See <http://www.squid-cache.org/Versions/v2/2.5/bugs/> for further
details.
- Adapt the follow_xff patch to changes in some of squid's data
structures and unbreak the WITH_SQUID_FOLLOW_XFF option.
- Bump PORTREVISION.
PR: ports/72840
Submitted by: Thomas-Martin Seck (maintainer)
Diffstat (limited to 'www/squid30')
-rw-r--r-- | www/squid30/Makefile | 3 | ||||
-rw-r--r-- | www/squid30/distinfo | 2 | ||||
-rw-r--r-- | www/squid30/files/follow_xff-2.5.patch | 30 |
3 files changed, 20 insertions, 15 deletions
diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 96a1ab1..6cf34eb 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -74,6 +74,7 @@ PORTNAME= squid PORTVERSION= 2.5.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -86,6 +87,8 @@ DISTNAME= squid-2.5.STABLE7 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ +PATCHFILES= squid-2.5.STABLE7-half_closed_POST.patch +PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de COMMENT= The successful WWW proxy cache and accelerator diff --git a/www/squid30/distinfo b/www/squid30/distinfo index c4d4b20..99d40be 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1,2 +1,4 @@ MD5 (squid2.5/squid-2.5.STABLE7.tar.bz2) = bf63e34906c68d716896eec0351108dc SIZE (squid2.5/squid-2.5.STABLE7.tar.bz2) = 1051830 +MD5 (squid2.5/squid-2.5.STABLE7-half_closed_POST.patch) = 7468154bb645932718d74c3dafcc9ec3 +SIZE (squid2.5/squid-2.5.STABLE7-half_closed_POST.patch) = 805 diff --git a/www/squid30/files/follow_xff-2.5.patch b/www/squid30/files/follow_xff-2.5.patch index 6f062e5..767de5d 100644 --- a/www/squid30/files/follow_xff-2.5.patch +++ b/www/squid30/files/follow_xff-2.5.patch @@ -342,14 +342,14 @@ Index: src/delay_pools.c ch.my_addr = r->my_addr; ch.my_port = r->my_port; Index: src/structs.h -*** src/structs.h.orig Thu Feb 26 20:32:47 2004 ---- src/structs.h Thu Feb 26 20:34:51 2004 +*** src/structs.h.orig Wed Oct 6 00:56:14 2004 +--- src/structs.h Mon Oct 18 20:23:13 2004 *************** -*** 594,599 **** ---- 594,604 ---- - int pipeline_prefetch; +*** 606,611 **** +--- 606,616 ---- int request_entities; int detect_broken_server_pconns; + int balance_on_multiple_ip; + #if FOLLOW_X_FORWARDED_FOR + int acl_uses_indirect_client; + int delay_pool_uses_indirect_client; @@ -359,8 +359,8 @@ Index: src/structs.h acl *aclList; struct { *************** -*** 615,620 **** ---- 620,628 ---- +*** 627,632 **** +--- 632,640 ---- acl_access *reply; acl_address *outgoing_address; acl_tos *outgoing_tos; @@ -371,8 +371,8 @@ Index: src/structs.h acl_deny_info_list *denyInfoList; struct _authConfig { *************** -*** 1611,1616 **** ---- 1619,1629 ---- +*** 1623,1628 **** +--- 1631,1641 ---- unsigned int internal:1; unsigned int body_sent:1; unsigned int reset_tcp:1; @@ -385,8 +385,8 @@ Index: src/structs.h struct _link_list { *************** -*** 1657,1662 **** ---- 1670,1678 ---- +*** 1669,1674 **** +--- 1682,1690 ---- int max_forwards; /* these in_addr's could probably be sockaddr_in's */ struct in_addr client_addr; @@ -397,11 +397,11 @@ Index: src/structs.h unsigned short my_port; HttpHeader header; *************** -*** 1667,1672 **** ---- 1683,1693 ---- - char *peer_login; /* Configured peer login:password */ - time_t lastmod; /* Used on refreshes */ +*** 1680,1685 **** +--- 1696,1706 ---- const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */ + BODY_HANDLER *body_reader; + void *body_reader_data; + #if FOLLOW_X_FORWARDED_FOR + /* XXX a list of IP addresses would be a better data structure + * than this String */ |