p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Increased memoization cache size for language codes. 

There may be more than 100 (default maxsize) commonly seen xx-yy values
on some sites. The additional memory consumption isn't significant.

Also added a comment explaining why this cache must have a maxsize.
This commit is contained in:
Aymeric Augustin 2014-03-29 19:44:11 +01:00
parent e819a3cd62
commit f356b6ecc3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/utils/translation/trans_real.py
View File

@ -389,12 +389,16 @@ def all_locale_paths():
return [globalpath] + list(settings.LOCALE_PATHS) return [globalpath] + list(settings.LOCALE_PATHS)
@lru_cache.lru_cache() @lru_cache.lru_cache(maxsize=1000)
def check_for_language(lang_code): def check_for_language(lang_code):
""" """
Checks whether there is a global language file for the given language Checks whether there is a global language file for the given language
code. This is used to decide whether a user-provided language is code. This is used to decide whether a user-provided language is
available. available.
lru_cache should have a maxsize to prevent from memory exhaustion attacks,
as the provided language codes are taken from the HTTP request. See also
<https://www.djangoproject.com/weblog/2007/oct/26/security-fix/>.
""" """
# First, a quick check to make sure lang_code is well-formed (#21458) # First, a quick check to make sure lang_code is well-formed (#21458)
if not language_code_re.search(lang_code): if not language_code_re.search(lang_code):