gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 16644: Plack: Use to_app to remove warning about Plack::App::CGIBin instance 

Using Plack with the debian psgi file, I get lots of warnings like:
WARNING: Automatically converting Plack::App::CGIBin instance to a PSGI code reference. If you see this warning for each request, you probably need to explicitly call to_app() i.e. Plack::App::CGIBin->new(...)->to_app in your PSGI file.

This patch is aimed to eliminate the warns.

Test plan:
Run Plack with plack.psgi or koha.psgi and verify if you do not see these
warnings anymore.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
I tested on Jessie and I see no regressions.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Marcel de Rooy 2016-06-03 11:31:44 +02:00 committed by Kyle M Hall
parent 38d1a1862d
commit d69d874a3f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/templates/plack.psgi vendored
View File

@ -54,15 +54,15 @@ use CGI qw(-utf8 ); # we will loose -utf8 under plack, otherwise
my $intranet = Plack::App::CGIBin->new(
root => '/usr/share/koha/intranet/cgi-bin'
);
)->to_app;
my $opac = Plack::App::CGIBin->new(
root => '/usr/share/koha/opac/cgi-bin/opac'
);
)->to_app;
# my $api = Plack::App::CGIBin->new(
# root => '/usr/share/koha/api/'
# );
# )->to_app;
builder {

2
misc/plack/koha.psgi
View File

@ -67,7 +67,7 @@ sub watch_for_size {
my $CGI_ROOT = $ENV{INTRANET} ? $ENV{INTRANETDIR} : $ENV{OPACDIR};
warn "# using Koha ", $ENV{INTRANET} ? 'intranet' : 'OPAC', " CGI from $CGI_ROOT\n";
my $app=Plack::App::CGIBin->new(root => $CGI_ROOT);
my $app=Plack::App::CGIBin->new(root => $CGI_ROOT)->to_app;
my $home = sub {
return [ 302, [ Location => '/cgi-bin/koha/' . ( $ENV{INTRANET} ? 'mainpage.pl' : 'opac-main.pl' ) ] ];
};