From: Rafael Kitover <rkitover@cpan.org>
Date: Sat, 26 Dec 2009 16:48:23 +0000 (+0000)
Subject: fix %SIG localization, release
X-Git-Tag: 0.030~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-WrapCGI.git;a=commitdiff_plain;h=af58e00cfb98670c45d650b07a450c1c34112819

fix %SIG localization, release
---

diff --git a/Changes b/Changes
index a798808..a19c26a 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Catalyst-Controller-WrapCGI
 
+0.025  2009-12-26 16:43:50
+    - fix %SIG localization in CGIBin
+
 0.024  2009-12-22 01:13:01
     - revert passing args to coderefs (some CGIs might implicitly shift off
      @ARGV .)
diff --git a/lib/Catalyst/Controller/CGIBin.pm b/lib/Catalyst/Controller/CGIBin.pm
index fa061c7..1ab022b 100644
--- a/lib/Catalyst/Controller/CGIBin.pm
+++ b/lib/Catalyst/Controller/CGIBin.pm
@@ -25,11 +25,11 @@ Catalyst::Controller::CGIBin - Serve CGIs from root/cgi-bin
 
 =head1 VERSION
 
-Version 0.024
+Version 0.025
 
 =cut
 
-our $VERSION = '0.024';
+our $VERSION = '0.025';
 
 =head1 SYNOPSIS
 
@@ -278,7 +278,7 @@ sub wrap_perl_cgi {
                 . "CGI::initialize_globals() "."\n"
                 . "    if defined &CGI::initialize_globals;"."\n"
                 . q/my $rv = eval {/."\n"
-                . 'local %SIG;'."\n"
+                . 'local *SIG = +{ %SIG };'."\n"
                 . "#line 1 $cgi"."\n"
                 . $code."\n"
                 . q/};/
diff --git a/lib/Catalyst/Controller/WrapCGI.pm b/lib/Catalyst/Controller/WrapCGI.pm
index 7236da2..8c5eb6d 100644
--- a/lib/Catalyst/Controller/WrapCGI.pm
+++ b/lib/Catalyst/Controller/WrapCGI.pm
@@ -21,11 +21,11 @@ Catalyst::Controller::WrapCGI - Run CGIs in Catalyst
 
 =head1 VERSION
 
-Version 0.024
+Version 0.025
 
 =cut
 
-our $VERSION = '0.024';
+our $VERSION = '0.025';
 
 =head1 SYNOPSIS
 
diff --git a/lib/CatalystX/GlobalContext.pm b/lib/CatalystX/GlobalContext.pm
index 7fba5db..560a955 100644
--- a/lib/CatalystX/GlobalContext.pm
+++ b/lib/CatalystX/GlobalContext.pm
@@ -15,11 +15,11 @@ CatalystX::GlobalContext - Export Catalyst Context
 
 =head1 VERSION
 
-Version 0.024
+Version 0.025
 
 =cut
 
-our $VERSION = '0.024';
+our $VERSION = '0.025';
 
 =head1 SYNOPSIS
 
diff --git a/t/lib/TestCGIBin/root/cgi-bin/sigs.pl b/t/lib/TestCGIBin/root/cgi-bin/sigs.pl
index b1cb8ab..3b017ae 100755
--- a/t/lib/TestCGIBin/root/cgi-bin/sigs.pl
+++ b/t/lib/TestCGIBin/root/cgi-bin/sigs.pl
@@ -5,7 +5,6 @@ use warnings;
 
 use CGI ':standard';
 
-$SIG{__DIE__} = sub { print "DIED!\n" };
-$SIG{__WARN__} = sub { print "WARNED!\n" };
+$SIG{USR1} = 'IGNORE';
 
 print header;