projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't re-encrypt password on replace also
[freeside.git]
/
rt
/
bin
/
webmux.pl
diff --git
a/rt/bin/webmux.pl
b/rt/bin/webmux.pl
index
96e7ebf
..
21cb83f
100755
(executable)
--- a/
rt/bin/webmux.pl
+++ b/
rt/bin/webmux.pl
@@
-31,7
+31,6
@@
BEGIN {
$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
$ENV{'ENV'} = '' if defined $ENV{'ENV'};
$ENV{'IFS'} = '' if defined $ENV{'IFS'};
$ENV{'SHELL'} = '/bin/sh' if defined $ENV{'SHELL'};
$ENV{'ENV'} = '' if defined $ENV{'ENV'};
$ENV{'IFS'} = '' if defined $ENV{'IFS'};
-
}
use lib ("/opt/rt3/local/lib", "/opt/rt3/lib");
}
use lib ("/opt/rt3/local/lib", "/opt/rt3/lib");
@@
-43,17
+42,6
@@
use CGI qw(-private_tempfiles); #bring this in before mason, to make sure we
#set private_tempfiles
BEGIN {
#set private_tempfiles
BEGIN {
- if ($mod_perl::VERSION >= 1.9908) {
- require Apache::RequestUtil;
- no warnings 'redefine';
- my $sub = *Apache::request{CODE};
- *Apache::request = sub {
- my $r;
- eval { $r = $sub->('Apache'); };
- # warn $@ if $@;
- return $r;
- };
- }
if ($CGI::MOD_PERL) {
require HTML::Mason::ApacheHandler;
}
if ($CGI::MOD_PERL) {
require HTML::Mason::ApacheHandler;
}
@@
-116,32
+104,21
@@
if ( $CGI::MOD_PERL) {
unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
}
unless ( ( -d _ ) and ( -r _ ) and ( -w _ ) );
}
-my $ah = &RT::Interface::Web::NewApacheHandler(
@RT::MasonParameters
) if $CGI::MOD_PERL;
+my $ah = &RT::Interface::Web::NewApacheHandler() if $CGI::MOD_PERL;
sub handler {
($r) = @_;
sub handler {
($r) = @_;
- local $SIG{__WARN__};
- local $SIG{__DIE__};
-
RT::Init();
# We don't need to handle non-text items
return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
my %session;
RT::Init();
# We don't need to handle non-text items
return -1 if defined( $r->content_type ) && $r->content_type !~ m|^text/|io;
my %session;
- my $status;
- eval { $status = $ah->handle_request($r) };
- if ($@) {
- $RT::Logger->crit($@);
- }
-
+ my $status = $ah->handle_request($r);
undef (%session);
undef (%session);
- if ($RT::Handle->TransactionDepth) {
- $RT::Handle->ForceRollback;
- $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") ;
- }
+ $RT::Logger->crit("Transaction not committed. Usually indicates a software fault. Data loss may have occurred") if $RT::Handle->TransactionDepth;
return $status;
}
return $status;
}