mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 01:55:49 +00:00
Code Issues 25 Releases Wiki Activity

[1.7.x] Fixed #22495 -- Locmem cache.add() failed with infinite timeouts

Browse Source 
cache.add() incorrectly succeeded when there was an existing key
with an infinite (None) timeout.
Backport of af5f688392 from master.
This commit is contained in:
Malcolm Box 2014-04-23 12:06:23 +01:00 committed by Claude Paroz
parent e192f13103
commit 07235aec9d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/cache/backends/locmem.py vendored
View File

@ -29,8 +29,8 @@ class LocMemCache(BaseCache):
self.validate_key(key)
pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
with self._lock.writer():
exp = self._expire_info.get(key)
if exp is None or exp <= time.time():
exp = self._expire_info.get(key, 0)
if exp is not None and exp <= time.time():
self._set(key, pickled, timeout)
return True
return False

3
tests/cache/tests.py vendored
View File

@ -491,6 +491,9 @@ class BaseCacheTests(object):
cache.add('key2', 'ham', None)
self.assertEqual(cache.get('key2'), 'ham')
added = cache.add('key1', 'new eggs', None)
self.assertEqual(added, False)
self.assertEqual(cache.get('key1'), 'eggs')
cache.set_many({'key3': 'sausage', 'key4': 'lobster bisque'}, None)
self.assertEqual(cache.get('key3'), 'sausage')