diff -N -c -r -X exclude_files squid-1.0.beta5/src/icp.c squid-1.0.beta5.henrik/src/icp.c *** squid-1.0.beta5/src/icp.c Fri Apr 26 01:25:04 1996 --- squid-1.0.beta5.henrik/src/icp.c Tue Apr 30 12:44:26 1996 *************** *** 1494,1506 **** static void CheckQuickAbort(astm) icpStateData *astm; { - if (!getQuickAbort()) - return; if (astm->entry == NULL) return; if (astm->entry->lock_count != 1) return; if (astm->entry->store_status == STORE_OK) return; BIT_SET(astm->entry->flag, CLIENT_ABORT_REQUEST); storeReleaseRequest(astm->entry); --- 1494,1507 ---- static void CheckQuickAbort(astm) icpStateData *astm; { if (astm->entry == NULL) return; if (astm->entry->lock_count != 1) return; if (astm->entry->store_status == STORE_OK) + return; + if (!getQuickAbort() && BIT_TEST(astm->flags,REQ_CACHABLE) && + !BIT_TEST(astm->entry->flag,KEY_PRIVATE)) return; BIT_SET(astm->entry->flag, CLIENT_ABORT_REQUEST); storeReleaseRequest(astm->entry);