Mercurial > hg-stable
changeset 2535:b8ccf6386db7
Arrange for old copies of CGI scripts to still work.
| author | Eric Hopper <hopper@omnifarious.org> |
|---|---|
| date | Thu, 29 Jun 2006 19:06:18 -0700 |
| parents | d5a3cc6520d5 |
| children | 8106e477f584 |
| files | mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py mercurial/hgweb/request.py mercurial/templater.py |
| diffstat | 4 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Thu Jun 29 18:34:26 2006 -0700 +++ b/mercurial/hgweb/hgweb_mod.py Thu Jun 29 19:06:18 2006 -0700 @@ -650,7 +650,16 @@ raise Exception("suspicious path") return p - def run(self, req): + def run(self): + if os.environ['GATEWAY_INTERFACE'][0:6] != "CGI/1.": + raise RuntimeError("This function is only intended to be called while running as a CGI script.") + import mercurial.hgweb.wsgicgi as wsgicgi + from request import wsgiapplication + def make_web_app(): + return self.__class__(self.repo, self.reponame) + wsgicgi.launch(wsgiapplication(make_web_app)) + + def run_wsgi(self, req): def header(**map): header_file = cStringIO.StringIO(''.join(self.t("header", **map))) msg = mimetools.Message(header_file, 0)
--- a/mercurial/hgweb/hgwebdir_mod.py Thu Jun 29 18:34:26 2006 -0700 +++ b/mercurial/hgweb/hgwebdir_mod.py Thu Jun 29 19:06:18 2006 -0700 @@ -20,6 +20,7 @@ def cleannames(items): return [(name.strip(os.sep), path) for name, path in items] + self.origconfig = config self.motd = "" self.repos_sorted = ('name', False) if isinstance(config, (list, tuple)): @@ -46,7 +47,16 @@ self.repos.append((name.lstrip(os.sep), repo)) self.repos.sort() - def run(self, req): + def run(self): + if os.environ['GATEWAY_INTERFACE'][0:6] != "CGI/1.": + raise RuntimeError("This function is only intended to be called while running as a CGI script.") + import mercurial.hgweb.wsgicgi as wsgicgi + from request import wsgiapplication + def make_web_app(): + return self.__class__(self.origconfig) + wsgicgi.launch(wsgiapplication(make_web_app)) + + def run_wsgi(self, req): def header(**map): header_file = cStringIO.StringIO(''.join(tmpl("header", **map))) msg = mimetools.Message(header_file, 0)
--- a/mercurial/hgweb/request.py Thu Jun 29 18:34:26 2006 -0700 +++ b/mercurial/hgweb/request.py Thu Jun 29 19:06:18 2006 -0700 @@ -48,7 +48,7 @@ self.form = cgi.parse(self.inp, self.env, keep_blank_values=1) self.start_response = start_response self.headers = [] - destination.run(self) + destination.run_wsgi(self) def __iter__(self): return iter([])