[Jifty-commit] r7494 - jifty/trunk/lib/Jifty

[Jifty commits]

Author: sartak
Date: Mon Sep 21 09:52:58 2009
New Revision: 7494

Modified:
   jifty/trunk/lib/Jifty/Web.pm

Log:
If we are in https, then stay in https

    ...unless the user explicitly passes in a scheme, which would be
    useful for a "disable ssl" link

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Mon Sep 21 09:52:58 2009
@@ -166,6 +166,9 @@
       $uri->port($port);
     }
 
+    # https is sticky
+    $uri->scheme('https') if $uri->scheme eq 'http' && Jifty->web->is_ssl;
+
     if ( defined $args{'scheme'} ) {
         $uri->scheme( $args{'scheme'} );
     }