[open-ils-commits] r16145 - in branches/rel_1_6/Open-ILS: examples/apache src/perlmods/OpenILS/Application (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-04-06 22:04:04 -0400 (Tue, 06 Apr 2010)
New Revision: 16145

Modified:
   branches/rel_1_6/Open-ILS/examples/apache/eg_vhost.conf
   branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
Log:
Fix syntax error in Actor.pm
Redirect HTTP connections to /opac/password to HTTPS


Modified: branches/rel_1_6/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- branches/rel_1_6/Open-ILS/examples/apache/eg_vhost.conf	2010-04-06 19:19:55 UTC (rev 16144)
+++ branches/rel_1_6/Open-ILS/examples/apache/eg_vhost.conf	2010-04-07 02:04:04 UTC (rev 16145)
@@ -172,6 +172,12 @@
     Options +ExecCGI
     PerlSendHeader On
     allow from all
+
+    # Force clients to use HTTPS
+    RewriteEngine On
+    RewriteCond %{HTTPS} !=on [NC]
+    RewriteCond %{REQUEST_URI} ^/opac/password(/.*)?
+    RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [R,L]
 </Location>
 
 # ----------------------------------------------------------------------------------

Modified: branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2010-04-06 19:19:55 UTC (rev 16144)
+++ branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2010-04-07 02:04:04 UTC (rev 16145)
@@ -3413,7 +3413,7 @@
             ]
         },
         where => {
-            has_been_reset => { '=' => 'f' } },
+            has_been_reset => { '=' => 'f' },
             request_time => { '>' => $threshold_time }
         }
     });