From 8b15c8328bd7a104aac0900cdf88f1670f1b0c9e Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 3 Jun 2016 11:31:44 +0200 Subject: [PATCH] Bug 16644: Plack: Use to_app to remove warning about Plack::App::CGIBin instance MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Tomas Cohen Arazi I tested on Jessie and I see no regressions. Signed-off-by: Kyle M Hall (cherry picked from commit d69d874a3f749687c2ff9a8d2a400378dfc94ff6) Signed-off-by: Frédéric Demians --- debian/templates/plack.psgi | 6 +++--- misc/plack/koha.psgi | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/templates/plack.psgi b/debian/templates/plack.psgi index af95a5aea0..704b91b5a4 100644 --- a/debian/templates/plack.psgi +++ b/debian/templates/plack.psgi @@ -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 { diff --git a/misc/plack/koha.psgi b/misc/plack/koha.psgi index 8a2ffd3292..20c6ca823f 100644 --- a/misc/plack/koha.psgi +++ b/misc/plack/koha.psgi @@ -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' ) ] ]; }; -- 2.39.5