comparison mercurial/hgweb/hgweb_mod.py @ 2558:1120302009d7

hgweb: fix unbundle.

After the WSGI changes, even if a push over HTTP succeeds, apache
complains about "Premature end of script headers: hgwebdir.cgi" and
returns a "HTTP Error 500: Internal Server Error", making the local hg
abort.

The change to either of the files touched by this patch is enough to fix
this, but I think changing both is a more robust solution.

2557:1727ff712a4e

                old_stdout = sys.stdout
                sys.stdout = cStringIO.StringIO()

                try:
                    ret = self.repo.addchangegroup(fp, 'serve')
                    req.write('%d\n' % ret)
                    req.write(sys.stdout.getvalue())
                finally:
                    sys.stdout = old_stdout
            finally:
                lock.release()
        finally:
            fp.close()
            os.unlink(tempname)

2558:1120302009d7

                old_stdout = sys.stdout
                sys.stdout = cStringIO.StringIO()

                try:
                    ret = self.repo.addchangegroup(fp, 'serve')
                finally:
                    val = sys.stdout.getvalue()
                    sys.stdout = old_stdout
                req.write('%d\n' % ret)
                req.write(val)
            finally:
                lock.release()
        finally:
            fp.close()
            os.unlink(tempname)