Backport r18130 from trunk

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

diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm
index 1fd0994..6c5f3da 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm
+++ b/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm
@@ -80,7 +80,7 @@ sub handler {
         my $base = $cgi->url(-base=>1);
                $base =~ s/^http:/https:/o;
                print "Location: $base".$apache->unparsed_uri."\n\n";
-               return Apache2::Const::OK;
+               return Apache2::Const::REDIRECT;
        }
 
        if (!$auth_ses) {

diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js
index 678d87e..b468fdc 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/holds.js
+++ b/Open-ILS/xul/staff_client/server/patron/holds.js
@@ -351,7 +351,7 @@ patron.holds.prototype = {
                                 });
 
                                 var loc = urls.XUL_BROWSER + "?url=" + window.escape(
-                                    xulG.url_prefix("/opac/extras/circ/alt_pull_list.html")
+                                    xulG.url_prefix("/opac/extras/circ/alt_pull_list.html").replace("http:","https:")
                                 );
                                 xulG.new_tab(
                                     loc, {