[rietveld] push by roge...@chromium.org - Merging default @ 0a75a06a0bee: hg merge -r default on 2012-05-10 16:41 GMT

[riet...@googlecode.com]

Revision: c23871a44d9a
Author: Roger Tawa <rog...@chromium.org>
Date: Thu May 10 09:39:31 2012
Log: Merging default @ 0a75a06a0bee: hg merge -r default
http://code.google.com/p/rietveld/source/detail?r=c23871a44d9a

Modified:
/codereview/views.py

=======================================
--- /codereview/views.py Mon Apr 30 11:37:11 2012
+++ /codereview/views.py Thu May 10 09:39:31 2012
@@ -719,7 +719,16 @@
# Try the previous hour's token
xsrf_token = account.get_xsrf_token(-1)
if post_token != xsrf_token:
- return HttpTextResponse('Invalid XSRF token.', status=403)
+ msg = [u'Invalid XSRF token.']
+ if request.POST:
+ msg.extend([u'',
+ u'However, this was the data posted to the
server:',
+ u''])
+ for key in request.POST:
+ msg.append(u'%s: %s' % (key, request.POST[key]))
+ msg.extend([u'', u'-'*10,
+ u'Please reload the previous page and post
again.'])
+ return HttpTextResponse(u'\n'.join(msg), status=403)
return func(request, *args, **kwds)

return xsrf_wrapper
@@ -2395,7 +2404,7 @@
"""/<issue>/content/<patchset>/<patch>/<content> - Return patch's
content."""
response = HttpResponse(request.content.data,
content_type=request.mime_type)
filename = re.sub(
- r'[^\w\.]', '_', response.patch.filename.encode('ascii', 'replace'))
+ r'[^\w\.]', '_', request.patch.filename.encode('ascii', 'replace'))
response['Content-Disposition'] = 'attachment; filename="%s"' % filename
response['Cache-Control'] = 'no-cache, no-store'
return response