Bug 25812: Fines can be displayed on SIP checkin/checkout

[srvgit] / C4 / Context.pm

diff --git a/C4/Context.pm b/C4/Context.pm
index 8cd7681..1aec123 100644 (file)
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -567,6 +567,8 @@ sub _new_Zconn {
         $o->option(preferredRecordSyntax => $syntax);
         $o->option(elementSetName => $elementSetName) if $elementSetName;
         $o->option(databaseName => _common_config($server, 'config') || 'biblios');
+        my $timeout = C4::Context->config('zebra_connection_timeout') || 30;
+        $o->option(timeout => $timeout);
 
         # create a new connection object
         $Zconn= create ZOOM::Connection($o);
@@ -1009,7 +1011,7 @@ this is a PSGI app or a CGI app, and implementing code as appropriate.
 
 sub psgi_env {
     my ( $self ) = @_;
-    return any { /^(psgi|plack)[._]/i } keys %ENV;
+    return any { /^(psgi\.|plack\.|PLACK_ENV$)/i } keys %ENV;
 }
 
 =head3 is_internal_PSGI_request