mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-10 11:05:54 +02:00
squid 3.5.22: latest patches (14100-14102)
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Matthias Fischer
committed by
Michael Tremer
Michael Tremer
parent
cc2a2209d8
commit
cc8f79f95f
@@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14099.patch
|
||||
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14100.patch
|
||||
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14101.patch
|
||||
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14102.patch
|
||||
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.22-fix-max-file-descriptors.patch
|
||||
|
||||
cd $(DIR_APP) && autoreconf -vfi
|
||||
|
||||
39
src/patches/squid/squid-3.5-14100.patch
Normal file
39
src/patches/squid/squid-3.5-14100.patch
Normal file
@@ -0,0 +1,39 @@
|
||||
------------------------------------------------------------
|
||||
revno: 14100
|
||||
revision-id: squid3@treenet.co.nz-20161025081949-3sxzd0n4snmadlke
|
||||
parent: squid3@treenet.co.nz-20161015042024-jagzafukd2t6gcr0
|
||||
author: Christos Tsantilas <chtsanti@users.sourceforge.net>
|
||||
committer: Amos Jeffries <squid3@treenet.co.nz>
|
||||
branch nick: 3.5
|
||||
timestamp: Tue 2016-10-25 21:19:49 +1300
|
||||
message:
|
||||
Fix regression bug introduced by r14089.
|
||||
|
||||
Squid crashed because HttpMsg::body_pipe was used without check that it
|
||||
was initialized. The message lacks body pipe when it has no body or
|
||||
empty body.
|
||||
------------------------------------------------------------
|
||||
# Bazaar merge directive format 2 (Bazaar 0.90)
|
||||
# revision_id: squid3@treenet.co.nz-20161025081949-3sxzd0n4snmadlke
|
||||
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
|
||||
# testament_sha1: 50468130801fc3ebf75129c103bcfe4be9b6d4b7
|
||||
# timestamp: 2016-10-25 08:28:30 +0000
|
||||
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
|
||||
# base_revision_id: squid3@treenet.co.nz-20161015042024-\
|
||||
# jagzafukd2t6gcr0
|
||||
#
|
||||
# Begin patch
|
||||
=== modified file 'src/adaptation/icap/ModXact.cc'
|
||||
--- src/adaptation/icap/ModXact.cc 2016-09-16 18:50:04 +0000
|
||||
+++ src/adaptation/icap/ModXact.cc 2016-10-25 08:19:49 +0000
|
||||
@@ -1303,7 +1303,8 @@
|
||||
virgin_msg = virgin_request_;
|
||||
assert(virgin_msg != virgin.cause);
|
||||
al.http.clientRequestSz.header = virgin_msg->hdr_sz;
|
||||
- al.http.clientRequestSz.payloadData = virgin_msg->body_pipe->producedSize();
|
||||
+ if (virgin_msg->body_pipe != NULL)
|
||||
+ al.http.clientRequestSz.payloadData = virgin_msg->body_pipe->producedSize();
|
||||
|
||||
// leave al.icap.bodyBytesRead negative if no body
|
||||
if (replyHttpHeaderSize >= 0 || replyHttpBodySize >= 0) {
|
||||
|
||||
59
src/patches/squid/squid-3.5-14101.patch
Normal file
59
src/patches/squid/squid-3.5-14101.patch
Normal file
@@ -0,0 +1,59 @@
|
||||
------------------------------------------------------------
|
||||
revno: 14101
|
||||
revision-id: squid3@treenet.co.nz-20161025082349-4gds2nic8qcahkem
|
||||
parent: squid3@treenet.co.nz-20161025081949-3sxzd0n4snmadlke
|
||||
committer: Amos Jeffries <squid3@treenet.co.nz>
|
||||
branch nick: 3.5
|
||||
timestamp: Tue 2016-10-25 21:23:49 +1300
|
||||
message:
|
||||
Fix external_acl_type default children documentations
|
||||
|
||||
The max children has always been 5, not 20.
|
||||
|
||||
Also, make mgr:config report dumper actually hide only the real default
|
||||
values. (sync with helper/ChildConfig.cc defaults)
|
||||
------------------------------------------------------------
|
||||
# Bazaar merge directive format 2 (Bazaar 0.90)
|
||||
# revision_id: squid3@treenet.co.nz-20161025082349-4gds2nic8qcahkem
|
||||
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
|
||||
# testament_sha1: 02234eff0589032ea31d911c20f792617eeb18a9
|
||||
# timestamp: 2016-10-25 08:28:32 +0000
|
||||
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
|
||||
# base_revision_id: squid3@treenet.co.nz-20161025081949-\
|
||||
# 3sxzd0n4snmadlke
|
||||
#
|
||||
# Begin patch
|
||||
=== modified file 'src/cf.data.pre'
|
||||
--- src/cf.data.pre 2016-09-23 15:28:42 +0000
|
||||
+++ src/cf.data.pre 2016-10-25 08:23:49 +0000
|
||||
@@ -678,7 +678,7 @@
|
||||
|
||||
children-max=n
|
||||
Maximum number of acl helper processes spawned to service
|
||||
- external acl lookups of this type. (default 20)
|
||||
+ external acl lookups of this type. (default 5)
|
||||
|
||||
children-startup=n
|
||||
Minimum number of acl helper processes to spawn during
|
||||
|
||||
=== modified file 'src/external_acl.cc'
|
||||
--- src/external_acl.cc 2016-05-17 18:14:16 +0000
|
||||
+++ src/external_acl.cc 2016-10-25 08:23:49 +0000
|
||||
@@ -474,13 +474,13 @@
|
||||
if (node->children.n_max != DEFAULT_EXTERNAL_ACL_CHILDREN)
|
||||
storeAppendPrintf(sentry, " children-max=%d", node->children.n_max);
|
||||
|
||||
- if (node->children.n_startup != 1)
|
||||
+ if (node->children.n_startup != 0) // sync with helper/ChildConfig.cc default
|
||||
storeAppendPrintf(sentry, " children-startup=%d", node->children.n_startup);
|
||||
|
||||
- if (node->children.n_idle != (node->children.n_max + node->children.n_startup) )
|
||||
+ if (node->children.n_idle != 1) // sync with helper/ChildConfig.cc default
|
||||
storeAppendPrintf(sentry, " children-idle=%d", node->children.n_idle);
|
||||
|
||||
- if (node->children.concurrency)
|
||||
+ if (node->children.concurrency != 0)
|
||||
storeAppendPrintf(sentry, " concurrency=%d", node->children.concurrency);
|
||||
|
||||
if (node->cache)
|
||||
|
||||
38
src/patches/squid/squid-3.5-14102.patch
Normal file
38
src/patches/squid/squid-3.5-14102.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
------------------------------------------------------------
|
||||
revno: 14102
|
||||
revision-id: squid3@treenet.co.nz-20161025082530-do632qnr9bwyk5et
|
||||
parent: squid3@treenet.co.nz-20161025082349-4gds2nic8qcahkem
|
||||
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4620
|
||||
author: Takahiro Kambe <taca@back-street.net>
|
||||
committer: Amos Jeffries <squid3@treenet.co.nz>
|
||||
branch nick: 3.5
|
||||
timestamp: Tue 2016-10-25 21:25:30 +1300
|
||||
message:
|
||||
Bug 4620: NetBSD build error with --enable-ipf-transparent
|
||||
|
||||
On NetBSD sys/param.h must be included before netinet/ip_compat.h
|
||||
------------------------------------------------------------
|
||||
# Bazaar merge directive format 2 (Bazaar 0.90)
|
||||
# revision_id: squid3@treenet.co.nz-20161025082530-do632qnr9bwyk5et
|
||||
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
|
||||
# testament_sha1: eedfc8764a631aa008fd4aba589ca08ee161c3a5
|
||||
# timestamp: 2016-10-25 08:28:35 +0000
|
||||
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
|
||||
# base_revision_id: squid3@treenet.co.nz-20161025082349-\
|
||||
# 4gds2nic8qcahkem
|
||||
#
|
||||
# Begin patch
|
||||
=== modified file 'src/ip/Intercept.cc'
|
||||
--- src/ip/Intercept.cc 2016-10-09 00:14:14 +0000
|
||||
+++ src/ip/Intercept.cc 2016-10-25 08:25:30 +0000
|
||||
@@ -25,6 +25,9 @@
|
||||
#define IPFILTER_VERSION 5000004
|
||||
#endif
|
||||
|
||||
+#if HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
#if HAVE_SYS_IOCCOM_H
|
||||
#include <sys/ioccom.h>
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user