Mercurial > hg-stable
changeset 25488:89ce95f907bd
hgewb: disable progress when serving (issue4582)
Before this patch, progress bar could be displayed when serving, creating
hypothetical problems.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Sun, 07 Jun 2015 17:14:17 -0700 |
parents | f7b8b4ae2d25 |
children | ef8956aa8755 |
files | mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py |
diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Tue Jun 09 12:57:57 2015 -0400 +++ b/mercurial/hgweb/hgweb_mod.py Sun Jun 07 17:14:17 2015 -0700 @@ -69,6 +69,10 @@ r.baseui.setconfig('ui', 'report_untrusted', 'off', 'hgweb') r.ui.setconfig('ui', 'nontty', 'true', 'hgweb') r.baseui.setconfig('ui', 'nontty', 'true', 'hgweb') + # displaying bundling progress bar while serving feel wrong and may + # break some wsgi implementation. + r.ui.setconfig('progress', 'disable', 'true', 'hgweb') + r.baseui.setconfig('progress', 'disable', 'true', 'hgweb') self.repo = r hook.redirect(True) self.repostate = ((-1, -1), (-1, -1))
--- a/mercurial/hgweb/hgwebdir_mod.py Tue Jun 09 12:57:57 2015 -0400 +++ b/mercurial/hgweb/hgwebdir_mod.py Sun Jun 07 17:14:17 2015 -0700 @@ -98,6 +98,9 @@ u = ui.ui() u.setconfig('ui', 'report_untrusted', 'off', 'hgwebdir') u.setconfig('ui', 'nontty', 'true', 'hgwebdir') + # displaying bundling progress bar while serving feels wrong and may + # break some wsgi implementations. + u.setconfig('progress', 'disable', 'true', 'hgweb') if not isinstance(self.conf, (dict, list, tuple)): map = {'paths': 'hgweb-paths'}