github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 08:17:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

ErrorController: Don't ever return a body in 204/304 responses.

Browse Source 
This should fix an issue where we return a JSON body for 304 responses
to API requests which is invalid according to the HTTP spec and appears
to be causing bad data to get cached in the CDN.
This commit is contained in:
Neil Williams
2013-01-11 11:00:22 -08:00
parent e1482553ca
commit a2e2e46312
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
r2/r2/controllers/error.py
View File

@@ -160,11 +160,17 @@ class ErrorController(RedditController):
if srname:
c.site = Subreddit._by_name(srname)
if c.render_style not in self.allowed_render_styles:
if code not in (204, 304):
return str(code)
else:
return ""
if code in (204, 304):
# NEVER return a content body on 204/304 or downstream
# caches may become very confused.
if request.GET.has_key('x-sup-id'):
x_sup_id = request.GET.get('x-sup-id')
if '\r\n' not in x_sup_id:
response.headers['x-sup-id'] = x_sup_id
return ""
elif c.render_style not in self.allowed_render_styles:
return str(code)
elif c.render_style in extensions.API_TYPES:
data = request.environ.get('extra_error_data', {'error': code})
return websafe_json(json.dumps(data))
@@ -182,12 +188,6 @@ class ErrorController(RedditController):
return redditbroke % (failien_url, rand_strings.sadmessages % randmin)
elif code == 503:
return self.send503()
elif code == 304:
if request.GET.has_key('x-sup-id'):
x_sup_id = request.GET.get('x-sup-id')
if '\r\n' not in x_sup_id:
response.headers['x-sup-id'] = x_sup_id
return ""
elif c.site:
return self.send404()
else: