update to squid-4.8
This commit is contained in:
parent
f1326bd572
commit
b8dcf425bf
@ -1,16 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.218 2019/06/09 19:36:24 cwen Exp $
|
||||
# $OpenBSD: Makefile,v 1.219 2019/07/10 15:14:49 sthen Exp $
|
||||
|
||||
COMMENT-main= WWW and FTP proxy cache and accelerator
|
||||
COMMENT-ldap= LDAP authentication/ACL support for Squid
|
||||
COMMENT-ntlm= NTLM authentication/ACL support for Squid
|
||||
|
||||
V= 4.7
|
||||
V= 4.8
|
||||
DISTNAME= squid-$V
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
PKGNAME-main= squid-$V
|
||||
PKGNAME-ldap= squid-ldap-$V
|
||||
PKGNAME-ntlm= squid-ntlm-$V
|
||||
REVISION-main= 0
|
||||
|
||||
CATEGORIES= www
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (squid-4.7.tar.xz) = opz2X3ercKixz0fm/h0pdeydBNJEbVRmmlr9Ku5eNU4=
|
||||
SIZE (squid-4.7.tar.xz) = 2440884
|
||||
SHA256 (squid-4.8.tar.xz) = eM2zJNkzQdNtCdX3kQYPboqqX/MXn3yUnNkQ0COoYhA=
|
||||
SIZE (squid-4.8.tar.xz) = 2440888
|
||||
|
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-src_comm_TcpAcceptor_cc,v 1.2 2019/05/11 12:40:40 sthen Exp $
|
||||
|
||||
Patch for locksup observed when accept() returns ECONNABORTED
|
||||
https://github.com/squid-cache/squid/pull/404
|
||||
|
||||
Index: src/comm/TcpAcceptor.cc
|
||||
--- src/comm/TcpAcceptor.cc.orig
|
||||
+++ src/comm/TcpAcceptor.cc
|
||||
@@ -361,7 +361,7 @@ Comm::TcpAcceptor::oldAccept(Comm::ConnectionPointer &
|
||||
|
||||
PROF_stop(comm_accept);
|
||||
|
||||
- if (ignoreErrno(errcode)) {
|
||||
+ if (ignoreErrno(errcode) || ECONNABORTED == errcode) {
|
||||
debugs(50, 5, status() << ": " << xstrerr(errcode));
|
||||
return Comm::NOMESSAGE;
|
||||
} else if (ENFILE == errno || EMFILE == errno) {
|
Loading…
Reference in New Issue
Block a user