webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-10 17:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

squid 3.5.27: Patch for SA 2018:1

Browse Source 
http://www.squid-cache.org/Versions/v3/3.5/changesets/

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
2018-01-20 18:50:51 +01:00
committed by Michael Tremer
parent 1f91201011
commit 101765c0fd
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/patches/squid/SQUID-2018_1.patch Normal file
View File

@@ -0,0 +1,28 @@
commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5)
Author: Amos Jeffries <yadij@users.noreply.github.com>
Date: 2018-01-19 13:54:14 +1300
ESI: make sure endofName never exceeds tagEnd (#130)
diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
index d86d2d3..db634d9 100644
--- a/src/esi/CustomParser.cc
+++ b/src/esi/CustomParser.cc
@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
char * endofName = strpbrk(const_cast<char *>(tag), w_space);
- if (endofName > tagEnd)
+ if (!endofName || endofName > tagEnd)
endofName = const_cast<char *>(tagEnd);
*endofName = '\0';
@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
char * endofName = strpbrk(const_cast<char *>(tag), w_space);
- if (endofName > tagEnd)
+ if (!endofName || endofName > tagEnd)
endofName = const_cast<char *>(tagEnd);
*endofName = '\0';

21
src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch Normal file
View File

@@ -0,0 +1,21 @@
--- configure.ac.~ Wed Apr 20 14:26:07 2016
+++ configure.ac Fri Apr 22 17:20:46 2016
@@ -3135,6 +3135,9 @@
;;
esac
+SQUID_CHECK_DEFAULT_FD_SETSIZE
+SQUID_CHECK_MAXFD
+
dnl --with-maxfd present for compatibility with Squid-2.
dnl undocumented in ./configure --help to encourage using the Squid-3 directive
AC_ARG_WITH(maxfd,,
@@ -3165,8 +3168,6 @@
esac
])
-SQUID_CHECK_DEFAULT_FD_SETSIZE
-SQUID_CHECK_MAXFD
if test "x$squid_filedescriptors_num" != "x"; then
AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
fi