diff options
-rw-r--r-- | perllib/Page.pm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm index cd9a4378d..e9f931d40 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -6,14 +6,14 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: Page.pm,v 1.78 2008-02-02 19:55:27 matthew Exp $ +# $Id: Page.pm,v 1.79 2008-02-03 19:23:51 matthew Exp $ # package Page; use strict; use Carp; -use CGI::Fast qw(-no_xhtml); +use mySociety::CGIFast qw(-no_xhtml); use Error qw(:try); use File::Slurp; use LWP::Simple; @@ -32,28 +32,15 @@ BEGIN { mySociety::Config::set_file("$FindBin::Bin/../conf/general"); } -# FastCGI signal handling - -my $exit_requested = 0; -my $handling_request = 0; - -#$SIG{TERM} = $SIG{USR1} = sub { -# $exit_requested = 1; -# # exit(0) unless $handling_request; -#}; - sub do_fastcgi { my $func = shift; try { my $W = new mySociety::WatchUpdate(); - while (my $q = new CGI::Fast()) { - $handling_request = 1; + while (my $q = new mySociety::CGIFast()) { &$func($q); dbh()->rollback() if $mySociety::DBHandle::conf_ok; $W->exit_if_changed(); - $handling_request = 0; - last if $exit_requested; } } catch Error::Simple with { my $E = shift; |