--------------------- PatchSet 5050 Date: 2002/09/19 09:41:16 Author: rbcollins Branch: fixrange Tag: (none) Log: reinstate partial request correct handling. Doh. Members: src/client_side.c:1.72.2.40->1.72.2.41 src/client_side_reply.c:1.4.6.16->1.4.6.17 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.72.2.40 retrieving revision 1.72.2.41 diff -u -r1.72.2.40 -r1.72.2.41 --- squid/src/client_side.c 19 Sep 2002 08:14:12 -0000 1.72.2.40 +++ squid/src/client_side.c 19 Sep 2002 09:41:16 -0000 1.72.2.41 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.72.2.40 2002/09/19 08:14:12 rbcollins Exp $ + * $Id: client_side.c,v 1.72.2.41 2002/09/19 09:41:16 rbcollins Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -788,7 +788,6 @@ clientSocketContext *context = data; clientHttpRequest *http = context->http; StoreEntry *entry = http->entry; - /* cheating: we are always the tail */ clientStreamNode *node = getTail (context); http->out.size += size; assert (fd > -1); @@ -1455,8 +1454,9 @@ } clientAccessCheck(http); continue; /* while offset > 0 && body.size_left == 0 */ - } else if (parser_return_code == 0 && !connKeepReadingIncompleteRequest(conn)) { - connCancelIncompleteRequests (conn); + } else if (parser_return_code == 0) { + if (!connKeepReadingIncompleteRequest(conn)) + connCancelIncompleteRequests (conn); break; } } /* while offset > 0 && conn->body.size_left == 0 */ Index: squid/src/client_side_reply.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/client_side_reply.c,v retrieving revision 1.4.6.16 retrieving revision 1.4.6.17 diff -u -r1.4.6.16 -r1.4.6.17 --- squid/src/client_side_reply.c 19 Sep 2002 08:22:52 -0000 1.4.6.16 +++ squid/src/client_side_reply.c 19 Sep 2002 09:41:16 -0000 1.4.6.17 @@ -1,6 +1,6 @@ /* - * $Id: client_side_reply.c,v 1.4.6.16 2002/09/19 08:22:52 rbcollins Exp $ + * $Id: client_side_reply.c,v 1.4.6.17 2002/09/19 09:41:16 rbcollins Exp $ * * DEBUG: section 88 Client-side Reply Routines * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c) @@ -57,7 +57,6 @@ } flags; clientStreamNode *ourNode; /* This will go away if/when this file gets refactored some more */ } clientReplyContext; - CBDATA_TYPE(clientReplyContext); /* Local functions */