--------------------- PatchSet 1618 Date: 2001/02/20 16:15:25 Author: adri Branch: modio Tag: modio_pre_range_kill Log: Fix the latest merge code to the modio state of mind Members: src/client_side.c:1.2.2.20->1.2.2.21 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.2.2.20 retrieving revision 1.2.2.21 diff -u -r1.2.2.20 -r1.2.2.21 --- squid/src/client_side.c 20 Feb 2001 15:39:42 -0000 1.2.2.20 +++ squid/src/client_side.c 20 Feb 2001 16:15:25 -0000 1.2.2.21 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.2.2.20 2001/02/20 15:39:42 adri Exp $ + * $Id: client_side.c,v 1.2.2.21 2001/02/20 16:15:25 adri Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -1824,11 +1824,11 @@ ErrorState *err; err = errorCon(ERR_ACCESS_DENIED, HTTP_FORBIDDEN); err->request = requestLink(http->request); - storeUnregister(http->sc, http->entry, http); - http->sc = NULL; + storeClientUnregister(http->entry, http); storeUnlockObject(http->entry); - http->entry = clientCreateStoreEntry(http, http->request->method, - null_request_flags); + http->entry = + clientCreateStoreEntry(http, http->request->method, + null_request_flags, REPLY_OBJ_INTERNAL); errorAppendEntry(http->entry, err); httpReplyDestroy(rep); return;