[PATCH 09/18] gitweb: Revert reset_output() back to original code
- From
John 'Warthog9' Hawley <warthog9@eaglescrag.net>
- Date
- Dec 9, 2010, 21:57 UTC
- Message-ID
- <1291931844-28454-10-git-send-email-warthog9@eaglescrag.net>
- In-Reply-To
- <1291931844-28454-1-git-send-email-warthog9@eaglescrag.net>
Reverted change to reset_output as
open STDOUT, ">&", \*STDOUT_REAL;
causes assertion failures:
Assertion !((((s->var)->sv_flags & (0x00004000|0x00008000)) == 0x00008000) && (((svtype)((s->var)->sv_flags & 0xff)) == SVt_PVGV || ((svtype)((s->var)->sv_flags & 0xff)) == SVt_PVLV)) failed: file "scalar.xs", line 49 at gitweb.cgi line 1221.
if we encounter an error *BEFORE* we've ever changed the output.
Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> --- gitweb/gitweb.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1d8bc74..e8c028b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1225,7 +1225,7 @@ sub change_output { sub reset_output { # This basically takes STDOUT_REAL and puts it back as STDOUT - open STDOUT, ">&", \*STDOUT_REAL; + open(STDOUT,">&STDOUT_REAL"); } sub run {
-- 1.7.2.3