Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Add support for optional default headers #88

Open
camflint wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for optional default headers #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion wptserve/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def __call__(self, request, response):
if not os.path.isdir(path):
raise HTTPException(404, "%s is not a directory" % path)

response.headers = [("Content-Type", "text/html")]
response.headers.set("Content-Type", "text/html")
response.content = """<!doctype html>
<meta name="viewport" content="width=device-width">
<title>Directory listing for %(path)s</title>
Expand Down
31 changes: 19 additions & 12 deletions wptserve/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,18 +250,25 @@ def handle_one_request(self):

if handler is None:
response.set_error(404)
else:
try:
handler(request, response)
except HTTPException as e:
response.set_error(e.code, e.message)
except Exception as e:
if e.message:
err = [e.message]
else:
err = []
err.append(traceback.format_exc())
response.set_error(500, "\n".join(err))
response.write()
return

# Set any default headers before calling the handler, so that any headers
# set in the handler will overwrite the defaults.
if "default_headers" in Server.config and Server.config["default_headers"]:
response.headers.update(Server.config["default_headers"])

try:
handler(request, response)
except HTTPException as e:
response.set_error(e.code, e.message)
except Exception as e:
if e.message:
err = [e.message]
else:
err = []
err.append(traceback.format_exc())
response.set_error(500, "\n".join(err))
self.logger.debug("%i %s %s (%s) %i" % (response.status[0],
request.method,
request.request_path,
Expand Down