]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Call StoreEntry::abort() instead of setting ENTRY_ABORTED flag.
authorAlex Rousskov <rousskov@measurement-factory.com>
Mon, 14 Feb 2011 04:56:59 +0000 (21:56 -0700)
committerAlex Rousskov <rousskov@measurement-factory.com>
Mon, 14 Feb 2011 04:56:59 +0000 (21:56 -0700)
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.

src/neighbors.cc

index 3490db232987472bb2f565787294201ce2478140..d145a393cca5c2934faa6e660a917505fbb09fb6 100644 (file)
@@ -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);