mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5
This commit is contained in:
commit
e5be039494
4
changes/ticket29617
Normal file
4
changes/ticket29617
Normal file
@ -0,0 +1,4 @@
|
||||
o Minor bugfixes (out-of-memory handler):
|
||||
- When purging the DNS cache because of an out-of-memory condition,
|
||||
try purging just the older entries at first. Previously, we would
|
||||
purge the whole thing. Fixes bug 29617; bugfix on 0.3.5.1-alpha.
|
@ -2130,7 +2130,8 @@ dns_cache_handle_oom(time_t now, size_t min_remove_bytes)
|
||||
current_size -= bytes_removed;
|
||||
total_bytes_removed += bytes_removed;
|
||||
|
||||
time_inc += 3600; /* Increase time_inc by 1 hour. */
|
||||
/* Increase time_inc by a reasonable fraction. */
|
||||
time_inc += (MAX_DNS_TTL_AT_EXIT / 4);
|
||||
} while (total_bytes_removed < min_remove_bytes);
|
||||
|
||||
return total_bytes_removed;
|
||||
|
Loading…
Reference in New Issue
Block a user