From 7515782ca6e453f2e4c9a52c62429e73ce047247 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 15 Aug 2010 00:44:55 +0000 Subject: address root cause of rt/rt links and remove the workarounds, RT#9280 --- htetc/freeside-rt.conf | 4 ---- htetc/handler.pl | 9 +++++---- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'htetc') diff --git a/htetc/freeside-rt.conf b/htetc/freeside-rt.conf index 2753bc6cc..8a6270623 100644 --- a/htetc/freeside-rt.conf +++ b/htetc/freeside-rt.conf @@ -1,10 +1,6 @@ - -allow from all -Satisfy any SetHandler perl-script PerlHandler HTML::Mason - diff --git a/htetc/handler.pl b/htetc/handler.pl index 94377cf34..eb9e67ee5 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -57,16 +57,17 @@ sub handler if ( $r->filename =~ /\/rt\// ) { #RT - $ah->interp($rt_interp); + # We don't need to handle non-text, non-xml items + return -1 if defined( $r->content_type ) + && $r->content_type !~ m!(^text/|\bxml\b)!io; + local $SIG{__WARN__}; local $SIG{__DIE__}; RT::Init(); - # We don't need to handle non-text, non-xml items - return -1 if defined( $r->content_type ) - && $r->content_type !~ m!(^text/|\bxml\b)!io; + $ah->interp($rt_interp); } else { -- cgit v1.2.1