-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Item14366: Reorder initialization to allow local CGI::Carp
Latest perl does not ship with CGI or CGI::Carp. By using a "use" statement in the BEGIN block, it's not possible to provide this module via setlib path overide. Change to a "require" and reorder initialization to call setlib before setting up CGI::Carp
- Loading branch information
Showing
34 changed files
with
247 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,58 @@ | ||
#! /usr/bin/env perl | ||
# Foswiki - The Free and Open Source Wiki, http://foswiki.org/ | ||
# | ||
# Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com | ||
# | ||
# This program is free software; you can redistribute it and/or | ||
# modify it under the terms of the GNU General Public License | ||
# as published by the Free Software Foundation; either version 2 | ||
# of the License, or (at your option) any later version. For | ||
# more details read LICENSE in the root of this distribution. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
# | ||
# As per the GPL, removal of this notice is prohibited. | ||
|
||
#! /usr/bin/env perl | ||
# See bottom of file for license and copyright information | ||
use strict; | ||
use warnings; | ||
|
||
use File::Spec; | ||
|
||
BEGIN { | ||
my ( $volume, $binDir, $action ) = File::Spec->splitpath(__FILE__); | ||
my $setlib = File::Spec->catpath( $volume, $binDir, 'setlib.cfg' ); | ||
@INC = ( '.', grep { $_ ne '.' } @INC ) unless $binDir; | ||
require $setlib; | ||
|
||
if ( defined $ENV{GATEWAY_INTERFACE} || defined $ENV{MOD_PERL} ) { | ||
$Foswiki::cfg{Engine} = 'Foswiki::Engine::CGI'; | ||
use CGI::Carp qw(fatalsToBrowser); | ||
require CGI::Carp; | ||
CGI::Carp->import(qw(fatalsToBrowser)); | ||
$SIG{__DIE__} = \&CGI::Carp::confess; | ||
} | ||
else { | ||
$Foswiki::cfg{Engine} = 'Foswiki::Engine::CLI'; | ||
require Carp; | ||
$SIG{__DIE__} = \&Carp::confess; | ||
} | ||
my ( $volume, $binDir, $action ) = File::Spec->splitpath(__FILE__); | ||
my $setlib = File::Spec->catpath( $volume, $binDir, 'setlib.cfg' ); | ||
@INC = ( '.', grep { $_ ne '.' } @INC ) unless $binDir; | ||
require $setlib; | ||
$action =~ s/\..*$//; # Remove eventual file extension | ||
$ENV{FOSWIKI_ACTION} = $action; | ||
} | ||
|
||
use Foswiki (); | ||
use Foswiki::UI (); | ||
$Foswiki::engine->run(); | ||
__END__ | ||
Foswiki - The Free and Open Source Wiki, http://foswiki.org/ | ||
Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors | ||
are listed in the AUTHORS file in the root of this distribution. | ||
NOTE: Please extend that file, not this notice. | ||
Additional copyrights apply to some or all of the code in this | ||
file as follows: | ||
Copyright (C) 2011-2015 Michael Daum http://michaeldaumconsulting.com | ||
Copyright (C) 1999-2007 Peter Thoeny, peter@thoeny.org | ||
and TWiki Contributors. All Rights Reserved. TWiki Contributors | ||
are listed in the AUTHORS file in the root of this distribution. | ||
This program is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU General Public License | ||
as published by the Free Software Foundation; either version 2 | ||
of the License, or (at your option) any later version. For | ||
more details read LICENSE in the root of this distribution. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
1; | ||
As per the GPL, removal of this notice is prohibited. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.