Index: squid/src/store_swapout.c
diff -c squid/src/store_swapout.c:1.85.2.9 squid/src/store_swapout.c:1.85.2.10
*** squid/src/store_swapout.c:1.85.2.9	Wed Apr 20 08:57:29 2005
--- squid/src/store_swapout.c	Sat Apr 30 06:40:28 2005
***************
*** 102,114 ****
 MemObject *mem = e->mem_obj;
 squid_off_t lowest_offset;
 squid_off_t new_mem_lo;
! int swapout_able = storeSwapOutAble(e);
 
 /* Don't pollute the disk with icons and other special entries */
 if (EBIT_TEST(e->flags, ENTRY_SPECIAL))
 	return -1;
 
! if (!swapout_able) {
 	/* Stop writing to disk */
 	storeReleaseRequest(e);
 	if (e->mem_obj->swapout.sio != NULL)
--- 102,119 ----
 MemObject *mem = e->mem_obj;
 squid_off_t lowest_offset;
 squid_off_t new_mem_lo;
! int swapout_able;
 
 /* Don't pollute the disk with icons and other special entries */
 if (EBIT_TEST(e->flags, ENTRY_SPECIAL))
 	return -1;
 
! /* Don't even attempt to free data from hot-cached objects */
! if (e->mem_status == IN_MEMORY)
! 	return 1;
! 
! swapout_able = storeSwapOutAble(e);
! if (!swapout_able && EBIT_TEST(e->flags, ENTRY_CACHABLE)) {
 	/* Stop writing to disk */
 	storeReleaseRequest(e);
 	if (e->mem_obj->swapout.sio != NULL)
***************
*** 121,131 ****
 lowest_offset = storeLowestMemReaderOffset(e);
 debug(20, 7) ("storeSwapOut: lowest_offset = %" PRINTF_OFF_T "\n",
 	lowest_offset);
! /*
! * Careful. lowest_offset can be greater than inmem_hi, such
! * as in the case of a range request.
! */
! if (mem->inmem_hi < lowest_offset) new_mem_lo = lowest_offset; else if (mem->inmem_hi> Config.Store.maxInMemObjSize)
 	new_mem_lo = lowest_offset;
--- 126,132 ----
 lowest_offset = storeLowestMemReaderOffset(e);
 debug(20, 7) ("storeSwapOut: lowest_offset = %" PRINTF_OFF_T "\n",
 	lowest_offset);
! if (!swapout_able)
 	new_mem_lo = lowest_offset;
 else if (mem->inmem_hi> Config.Store.maxInMemObjSize)
 	new_mem_lo = lowest_offset;
***************
*** 134,141 ****
 else
 	new_mem_lo = mem->inmem_lo;
 /* The -1 makes sure the page isn't freed until storeSwapOut has
! * walked to the next page. (mem->swapout.memnode) */
! if (swapout_able) {
 	squid_off_t on_disk = storeSwapOutObjectBytesOnDisk(e->mem_obj);
 	if (on_disk - 1 < new_mem_lo) new_mem_lo = on_disk - 1; --- 135,142 ---- else new_mem_lo = mem->inmem_lo;
 /* The -1 makes sure the page isn't freed until storeSwapOut has
! * walked to the next page. (mem->swapout.memnode->next) */
! if (swapout_able && new_mem_lo) {
 	squid_off_t on_disk = storeSwapOutObjectBytesOnDisk(e->mem_obj);
 	if (on_disk - 1 < new_mem_lo) new_mem_lo = on_disk - 1; *************** *** 144,149 **** --- 145,151 ---- new_mem_lo = mem->inmem_lo;
 if (mem->inmem_lo != new_mem_lo)
 	mem->inmem_lo = stmemFreeDataUpto(&mem->data_hdr, new_mem_lo);
+ 
 return swapout_able;
 }
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9_2GB-hot_cache.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9_2GB-hot_cache.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>