X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fresp.py;h=965df6c8c18a76e41e659f92eccf08ef57f4fe30;hp=69635f8589ebb133ed4dfae0707e1d57a2fbaef1;hb=51a13716668cc48bf87e0d0296f8b9900fafe83b;hpb=2a5a8ce70a0107b7bfd5bd3459ae4aae3a7558e2 diff --git a/wrw/resp.py b/wrw/resp.py index 69635f8..965df6c 100644 --- a/wrw/resp.py +++ b/wrw/resp.py @@ -42,10 +42,10 @@ class message(dispatch.restart): self.detail = detail def handle(self, req): - return skelfor(req).error(req, self.message, *self.detail) + return skelfor(req).message(req, self.message, *self.detail) class httperror(usererror): - def __init__(self, status, message = None, detail = None): + def __init__(self, status, message=None, detail=None): if message is None: message = proto.statusinfo[status][0] if detail is None: @@ -62,14 +62,21 @@ class notfound(httperror): return super().__init__(404) class redirect(dispatch.restart): - def __init__(self, url, status = 303): + bases = {"url": proto.requrl, + "script": proto.scripturl, + "site": proto.siteurl} + + def __init__(self, url, status=303, base="url"): super().__init__() self.url = url self.status = status + self.bases[base] + self.base = base def handle(self, req): req.status(self.status, "Redirect") - req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url) + req.ohead["Location"] = proto.appendurl(self.bases[self.base](req), self.url) + req.ohead["Content-Length"] = 0 return [] class unmodified(dispatch.restart):