X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FApache%2FBase.pm;h=ebb31486214a80bda66ad872c646cced60e0a844;hb=b77e7869b55e0d2df5aaa3a37ad2cca9c0989abc;hp=ddb60f4d14454d473a362fe6d5812ab358f59419;hpb=53164baef55035413133f63141227bd2b2e0d29d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/Apache/Base.pm b/lib/Catalyst/Engine/Apache/Base.pm
index ddb60f4..ebb3148 100644
--- a/lib/Catalyst/Engine/Apache/Base.pm
+++ b/lib/Catalyst/Engine/Apache/Base.pm
@@ -78,7 +78,11 @@ sub prepare_connection {
     $c->request->protocol( $c->apache->protocol );
     $c->request->user( $c->apache->user );
 
-    if ( $ENV{HTTPS} || $c->apache->get_server_port == 443 ) {
+    if ( $ENV{HTTPS} && uc( $ENV{HTTPS} ) eq 'ON' ) {
+        $c->request->secure(1);
+    }
+
+    if ( $c->apache->get_server_port == 443 ) {
         $c->request->secure(1);
     }
 }
@@ -114,7 +118,7 @@ sub prepare_path {
 
         $path =~ s/^\///;
 
-        if ( $c->apache->filename && -e $c->apache->filename ) {
+        if ( $c->apache->filename && -f $c->apache->filename && -x _ ) {
 
             my $filename = ( File::Spec->splitpath( $c->apache->filename ) )[2];