View | Details | Raw Unified | Return to bug 239214
Collapse All | Expand All

(-)squid/Makefile (-2 / +1 lines)
Lines 1-8 Link Here
1
# $FreeBSD: head/www/squid/Makefile 506289 2019-07-09 17:13:07Z sunpoet $
1
# $FreeBSD: head/www/squid/Makefile 506289 2019-07-09 17:13:07Z sunpoet $
2
2
3
PORTNAME=	squid
3
PORTNAME=	squid
4
PORTVERSION=	4.7
4
PORTVERSION=	4.8
5
PORTREVISION=	2
6
CATEGORIES=	www ipv6
5
CATEGORIES=	www ipv6
7
MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
6
MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
8
		http://www2.us.squid-cache.org/Versions/v4/ \
7
		http://www2.us.squid-cache.org/Versions/v4/ \
(-)squid/distinfo (-2 / +2 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1557845771
1
TIMESTAMP = 1557845771
2
SHA256 (squid4/squid-4.7.tar.xz) = a29cf65f77ab70a8b1cf47e6fe1d2975ec9d04d2446d54669a5afd2aee5e354e
2
SHA256 (squid4/squid-4.8.tar.xz) = 78cdb324d93341d36d09d5f791060f6e8aaa5ff3179f7c949cd910d023a86210
3
SIZE (squid4/squid-4.7.tar.xz) = 2440884
3
SIZE (squid4/squid-4.8.tar.xz) = 2440888
(-)squid/files/patch-src_comm_TcpAcceptor.cc (-25 lines)
Lines 1-25 Link Here
1
--- src/comm/TcpAcceptor.cc.orig	2018-10-27 20:44:55 UTC
2
+++ src/comm/TcpAcceptor.cc
3
@@ -297,6 +297,7 @@ Comm::TcpAcceptor::acceptOne()
4
         if (intendedForUserConnections())
5
             logAcceptError(newConnDetails);
6
         notify(flag, newConnDetails);
7
+        // XXX: Will not stop because doAccept() is not called asynchronously.
8
         mustStop("Listener socket closed");
9
         return;
10
     }
11
@@ -366,11 +367,12 @@ Comm::TcpAcceptor::oldAccept(Comm::Conne
12
 
13
         PROF_stop(comm_accept);
14
 
15
-        if (ignoreErrno(errcode)) {
16
+        if (ignoreErrno(errcode) || errcode == ECONNABORTED) {
17
             debugs(50, 5, status() << ": " << xstrerr(errcode));
18
             return Comm::NOMESSAGE;
19
-        } else if (ENFILE == errno || EMFILE == errno) {
20
+        } else if (errcode == ENFILE || errcode == EMFILE) {
21
             debugs(50, 3, status() << ": " << xstrerr(errcode));
22
+            // XXX: These errors do not imply that we should stop listening.
23
             return Comm::COMM_ERROR;
24
         } else {
25
             debugs(50, DBG_IMPORTANT, MYNAME << status() << ": " << xstrerr(errcode));

Return to bug 239214