Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hgweb/request.py @ 37828:3e3acf5d6a07 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: allow Content-Security-Policy header on 304 responses (issue5844) A side-effect of 98baf8dea553 was that the Content-Security-Policy header was set on all HTTP responses by default. This header wasn't in our list of allowed headers for HTTP 304 responses. This would trigger a ProgrammingError when a 304 response was issued via hgwebdir. This commit adds Content-Security-Policy to the allow list of headers for 304 responses so we no longer encounter the error. Differential Revision: https://phab.mercurial-scm.org/D3436
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 30 Apr 2018 17:28:59 -0700
parents e82b137a8b4e
children 6107d4549fcc
line wrap: on
line diff
--- a/mercurial/hgweb/request.py	Mon Apr 30 17:22:20 2018 -0700
+++ b/mercurial/hgweb/request.py	Mon Apr 30 17:28:59 2018 -0700
@@ -473,6 +473,7 @@
                           if k.lower() not in ('date', 'etag', 'expires',
                                                'cache-control',
                                                'content-location',
+                                               'content-security-policy',
                                                'vary')}
             if badheaders:
                 raise error.ProgrammingError(