Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hgweb/hgweb_mod.py @ 2514:419c42223bee
Really fix http headers for web UI and issue 254.
This also arranges for static content to allow a keepalive connection.
| author | Eric Hopper <hopper@omnifarious.org> |
|---|---|
| date | Tue, 27 Jun 2006 09:33:12 -0700 |
| parents | 6350b01d173f |
| children | d5a3cc6520d5 |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Tue Jun 27 09:30:50 2006 -0700 +++ b/mercurial/hgweb/hgweb_mod.py Tue Jun 27 09:33:12 2006 -0700 @@ -10,7 +10,7 @@ import os.path import mimetypes from mercurial.demandload import demandload -demandload(globals(), "re zlib ConfigParser cStringIO sys tempfile") +demandload(globals(), "re zlib ConfigParser mimetools cStringIO sys tempfile") demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,templater") demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile") from mercurial.node import * @@ -652,7 +652,10 @@ def run(self, req): def header(**map): - yield self.t("header", **map) + header_file = cStringIO.StringIO(''.join(self.t("header", **map))) + msg = mimetools.Message(header_file, 0) + req.header(msg.items()) + yield header_file.read() def footer(**map): yield self.t("footer", @@ -828,7 +831,7 @@ static = self.repo.ui.config("web", "static", os.path.join(self.templatepath, "static")) - req.write(staticfile(static, fname) + req.write(staticfile(static, fname, req) or self.t("error", error="%r not found" % fname)) def do_capabilities(self, req):