--------------------- PatchSet 317 Date: 2002/12/11 11:07:35 Author: apbarrett Branch: follow_xff Tag: (none) Log: Fix an assertion failure: clientFollowXForwardedForDone() should not call aclChecklistFree(), it should just set context->acl_checklist = NULL. Members: src/client_side_request.cc:1.4.6.4->1.4.6.5 Index: squid3/src/client_side_request.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/client_side_request.cc,v retrieving revision 1.4.6.4 retrieving revision 1.4.6.5 diff -u -r1.4.6.4 -r1.4.6.5 --- squid3/src/client_side_request.cc 9 Dec 2002 18:28:34 -0000 1.4.6.4 +++ squid3/src/client_side_request.cc 11 Dec 2002 11:07:35 -0000 1.4.6.5 @@ -1,6 +1,6 @@ /* - * $Id: client_side_request.cc,v 1.4.6.4 2002/12/09 18:28:34 apbarrett Exp $ + * $Id: client_side_request.cc,v 1.4.6.5 2002/12/11 11:07:35 apbarrett Exp $ * * DEBUG: section 85 Client-side Request Routines * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c) @@ -277,6 +277,7 @@ clientRequestContext *context = (clientRequestContext *)data; clientHttpRequest *http = context->http; request_t *request = http->request; + context->acl_checklist = NULL; /* * answer should be be ACCESS_ALLOWED or ACCESS_DENIED if we are * called as a result of ACL checks, or -1 if we are called when @@ -367,8 +368,6 @@ inet_ntoa(conn->log_addr)); } stringClean(&context->xff_state); - if (context->acl_checklist) - aclChecklistFree(context->acl_checklist); clientAccessCheckContinue(context); } #endif /* FOLLOW_X_FORWARDED_FOR */