--------------------- PatchSet 11257 Date: 2007/02/24 10:58:30 Author: hno Branch: HEAD Tag: (none) Log: Adjust handlign of aborted requests to deal properly with buffered responses Members: src/http.c:1.426->1.427 Index: squid/src/http.c =================================================================== RCS file: /cvsroot/squid/squid/src/http.c,v retrieving revision 1.426 retrieving revision 1.427 diff -u -r1.426 -r1.427 --- squid/src/http.c 24 Feb 2007 09:57:06 -0000 1.426 +++ squid/src/http.c 24 Feb 2007 10:58:30 -0000 1.427 @@ -1,6 +1,6 @@ /* - * $Id: http.c,v 1.426 2007/02/24 09:57:06 hno Exp $ + * $Id: http.c,v 1.427 2007/02/24 10:58:30 hno Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -709,6 +709,14 @@ } } storeBufferFlush(entry); + if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) { + /* + * the above storeBufferFlush() call could ABORT this entry, + * in that case, the server FD should already be closed. + * there's nothing for us to do. + */ + return; + } if (!httpState->chunk_size && !httpState->flags.chunked) complete = 1; if (!complete && len == 0) {