--------------------- PatchSet 6258 Date: 2004/08/04 17:16:23 Author: dwsquid Branch: icap-2_5 Tag: (none) Log: Patch From olivier - close the ICAP FD if the HTTP entry becomes aborted Members: src/icap_respmod.c:1.1.2.38->1.1.2.39 Index: squid/src/icap_respmod.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/icap_respmod.c,v retrieving revision 1.1.2.38 retrieving revision 1.1.2.39 diff -u -r1.1.2.38 -r1.1.2.39 --- squid/src/icap_respmod.c 4 Aug 2004 17:14:46 -0000 1.1.2.38 +++ squid/src/icap_respmod.c 4 Aug 2004 17:16:23 -0000 1.1.2.39 @@ -1,6 +1,6 @@ /* - * $Id: icap_respmod.c,v 1.1.2.38 2004/08/04 17:14:46 dwsquid Exp $ + * $Id: icap_respmod.c,v 1.1.2.39 2004/08/04 17:16:23 dwsquid Exp $ * * DEBUG: section 81 Internet Content Adaptation Protocol (ICAP) Client * AUTHOR: Geetha Manjunath, Hewlett Packard Company @@ -896,12 +896,7 @@ int fd = icap->icap_fd; debug(81, 3) ("icapReadReply3\n"); if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) { - /* - * the above storeAppend() call could ABORT this entry, - * in that case, the server FD should already be closed. - * there's nothing for us to do. - */ - (void) 0; + comm_close(fd); } else if (icapPconnTransferDone(fd, icap)) { /* yes we have to clear all these! */ commSetDefer(fd, NULL, NULL);