From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 14 Feb 2011 04:56:59 +0000 (-0700)
Subject: Call StoreEntry::abort() instead of setting ENTRY_ABORTED flag.
X-Git-Tag: take04~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc52369a86625fb0c32e5de1ccc4b5e758546c30;p=thirdparty%2Fsquid.git

Call StoreEntry::abort() instead of setting ENTRY_ABORTED flag.

This may be necessary because the abort() method does more than just setting
the flag and releasing the request. It guarantees, for example, that the
swapout I/O, if any, is closed.

This change is untested.
---

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 3490db2329..d145a393cc 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1510,9 +1510,8 @@ peerCountMcastPeersDone(void *data)
 
     cbdataReferenceDone(psstate->callback_data);
 
-    EBIT_SET(fake->flags, ENTRY_ABORTED);
+    fake->abort(); // sets ENTRY_ABORTED and initiates releated cleanup
     HTTPMSGUNLOCK(fake->mem_obj->request);
-    fake->releaseRequest();
     fake->unlock();
     HTTPMSGUNLOCK(psstate->request);
     cbdataFree(psstate);