webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

squid: Update to 3.5.24

Browse Source 
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
2017-01-28 23:31:50 +01:00
committed by Michael Tremer
parent dfcf70ba39
commit 48db07db14
3 changed files with 4 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lfs/squid
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config include Config
VER = 3.5.23 VER = 3.5.24
THISAPP = squid-$(VER) THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9b68f689e3d9578932b9c6a4041037c2 $(DL_FILE)_MD5 = 3fae511e16b6379b61c011914673973d
install : $(TARGET) install : $(TARGET)
@@ -70,8 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) @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-14129.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.24-fix-max-file-descriptors.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.23-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi

0
src/patches/squid-3.5.23-fix-max-file-descriptors.patch → src/patches/squid-3.5.24-fix-max-file-descriptors.patch
View File

41
src/patches/squid/squid-3.5-14129.patch
View File

@@ -1,41 +0,0 @@
------------------------------------------------------------
revno: 14129
revision-id: squid3@treenet.co.nz-20161226022200-u1dnvhu0rdby78u2
parent: squid3@treenet.co.nz-20161216043137-lsk9s4fq21sqsdfo
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3940
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Mon 2016-12-26 15:22:00 +1300
message:
Bug 3940 pt2: Make 'cache deny' do what is documented
Instead of overriding whatever cacheability was previously set to
(including changing non-cacheables to be cacheable) actually
prevent both cache read and write.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20161226022200-u1dnvhu0rdby78u2
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 579020c4bb34961317f8fd0498393aba4a797b14
# timestamp: 2016-12-26 02:23:14 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20161216043137-\
# lsk9s4fq21sqsdfo
#
# Begin patch
=== modified file 'src/client_side_request.cc'
--- src/client_side_request.cc 2016-09-23 15:28:42 +0000
+++ src/client_side_request.cc 2016-12-26 02:22:00 +0000
@@ -1407,7 +1407,10 @@
ClientRequestContext::checkNoCacheDone(const allow_t &answer)
{
acl_checklist = NULL;
- http->request->flags.cachable = (answer == ACCESS_ALLOWED);
+ if (answer == ACCESS_DENIED) {
+ http->request->flags.noCache = true; // dont read reply from cache
+ http->request->flags.cachable = false; // dont store reply into cache
+ }
http->doCallouts();
}