--------------------- PatchSet 7014 Date: 2005/09/06 12:36:09 Author: swsf Branch: epoll-2_5 Tag: (none) Log: Half-closed connections does actually work now. Members: src/client_side.c:1.47.2.59.2.4->1.47.2.59.2.5 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.47.2.59.2.4 retrieving revision 1.47.2.59.2.5 diff -u -r1.47.2.59.2.4 -r1.47.2.59.2.5 --- squid/src/client_side.c 25 Apr 2005 20:59:36 -0000 1.47.2.59.2.4 +++ squid/src/client_side.c 6 Sep 2005 12:36:09 -0000 1.47.2.59.2.5 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.47.2.59.2.4 2005/04/25 20:59:36 hno Exp $ + * $Id: client_side.c,v 1.47.2.59.2.5 2005/09/06 12:36:09 swsf Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -2991,13 +2991,7 @@ debug(33, 4) ("clientReadRequest: FD %d closed\n", fd); comm_close(fd); return; - } else -#if HAVE_EPOLL - /* epoll patch does not work with half-closed connections */ - { -#else - if (!Config.onoff.half_closed_clients) { -#endif + } else if (!Config.onoff.half_closed_clients) { /* admin doesn't want to support half-closed client sockets */ debug(33, 3) ("clientReadRequest: FD %d aborted (half_closed_clients disabled)\n", fd); comm_close(fd);