Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 17:14:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cherry-pick a wptserve change to support Content-Type in .headers files.

Browse source
This commit is contained in:
Ms2ger 2016-09-27 17:01:13 +02:00
parent 1ed3521dcf
commit b15c55e407
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
View file

@ -147,9 +147,12 @@ class FileHandler(object):
raise HTTPException(404) raise HTTPException(404)
def get_headers(self, request, path): def get_headers(self, request, path):
rv = self.default_headers(path) rv = (self.load_headers(request, os.path.join(os.path.split(path)[0], "__dir__")) +
rv.extend(self.load_headers(request, os.path.join(os.path.split(path)[0], "__dir__"))) self.load_headers(request, path))
rv.extend(self.load_headers(request, path))
if not any(key.lower() == "content-type" for (key, _) in rv):
rv.insert(0, ("Content-Type", guess_content_type(path)))
return rv return rv
def load_headers(self, request, path): def load_headers(self, request, path):
@ -206,9 +209,6 @@ class FileHandler(object):
f.seek(byte_range.lower) f.seek(byte_range.lower)
return f.read(byte_range.upper - byte_range.lower) return f.read(byte_range.upper - byte_range.lower)
def default_headers(self, path):
return [("Content-Type", guess_content_type(path))]
file_handler = FileHandler() file_handler = FileHandler()