mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-11 01:38:25 +02:00
squid: Update from 5.2 => 5.4.1
For details see: http://www.squid-cache.org/Versions/v5/changesets/SQUID_5_4_1.html This is 'squid 5.4.1', containing the previous patch for Bug #5055. Prior to this patch I reverted my previous patches 'squid: Update 5.2 => 5.4" and 'squid 5.4: Latest patch - Bug #5055 - from upstream' and marked them as 'superseded' in patchwork. For a better overview the 'squid-gcc11'-patch has been renamed again and moved to an own squid-patch-directory. Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
committed by
Arne Fitzenreiter
parent
4b94860d07
commit
1217807d09
24
src/patches/squid/01_squid-gcc11.patch
Normal file
24
src/patches/squid/01_squid-gcc11.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
diff --git a/src/acl/ConnMark.cc b/src/acl/ConnMark.cc
|
||||
index 1fdae0c..213cf39 100644
|
||||
--- a/src/acl/ConnMark.cc
|
||||
+++ b/src/acl/ConnMark.cc
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "Debug.h"
|
||||
#include "http/Stream.h"
|
||||
#include "sbuf/Stream.h"
|
||||
+#include <limits>
|
||||
|
||||
bool
|
||||
Acl::ConnMark::empty() const
|
||||
diff --git a/src/security/ServerOptions.cc b/src/security/ServerOptions.cc
|
||||
index 5cd81ab..3f73892 100644
|
||||
--- a/src/security/ServerOptions.cc
|
||||
+++ b/src/security/ServerOptions.cc
|
||||
@@ -6,6 +6,7 @@
|
||||
* Please see the COPYING and CONTRIBUTORS files for details.
|
||||
*/
|
||||
|
||||
+#include <limits>
|
||||
#include "squid.h"
|
||||
#include "anyp/PortCfg.h"
|
||||
#include "base/Packable.h"
|
||||
Reference in New Issue
Block a user