moved redirect to latest mod_perl

added a .js file to the opac that was missing
fixed unitialized value logging in appsession

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1539 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm
index abddc32..1288987 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm
+++ b/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm
@@ -3,12 +3,12 @@ use strict; use warnings;
 use Socket;
 
 use Apache2 ();
-use Apache::Log;
-use Apache::Const -compile => qw(OK REDIRECT :log);
+use Apache2::Log;
+use Apache2::Const -compile => qw(OK REDIRECT :log);
 use APR::Const    -compile => qw(:error SUCCESS);
 use Template qw(:template);
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 use CGI ();
 
 use OpenSRF::AppSession;
@@ -127,7 +127,7 @@ sub print_page {
        </html>
        HTML
 
-       return Apache::OK;
+       return Apache2::Const::OK;
 }
 
 

diff --git a/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk b/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk
index 02befd8..72d8910 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk
+++ b/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk
@@ -12,6 +12,7 @@
                        js( src='http://gapines.org/js/util/JSON.js' );
                        js( src='http://gapines.org/js/opac/Page.js' );
                        js( src='http://gapines.org/js/opac/MyOPACSPage.js' );
+                       js( src='http://gapines.org/js/opac/LoginDialog.js' );
                        js( src='http://gapines.org/js/util/RemoteRequest.js' );
                        js( src='http://gapines.org/js/util/webutils.js' );
                        js( src='http://gapines.org/js/util/ils_utils.js' );

diff --git a/OpenSRF/src/perlmods/OpenSRF/AppSession.pm b/OpenSRF/src/perlmods/OpenSRF/AppSession.pm
index e7dbde3..80e62c2 100644 (file)
--- a/OpenSRF/src/perlmods/OpenSRF/AppSession.pm
+++ b/OpenSRF/src/perlmods/OpenSRF/AppSession.pm
@@ -740,7 +740,9 @@ sub recv {
 
        #$args{timeout} = 0 if ($self->complete);
 
-       $logger->debug( ref($self) ."->recv with timeout " . $args{timeout}, INTERNAL );
+       if(defined($args{timeout})) {
+               $logger->debug( ref($self) ."->recv with timeout " . $args{timeout}, INTERNAL );
+       }
 
        $args{count} ||= 1;