[Jifty-commit] r6171 - in jifty/trunk: lib/Jifty

[Jifty commits]

Author: alexmv
Date: Sat Dec 20 01:40:46 2008
New Revision: 6171

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Web.pm

Log:
 r40222 at kohr-ah:  chmrr | 2008-12-20 01:40:33 -0500
  * Logic fix -- $1 will never be defined, as the top of the block is a !~ check


Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Sat Dec 20 01:40:46 2008
@@ -138,8 +138,7 @@
         my $dirty;
         if ($http_host_env !~ m{^http(s?)://}) {
             $dirty++;
-            $http_host_env = "http://" . $http_host_env;
-            $http_host_env =~ s/http/https/ if $1 eq 's' || Jifty->web->is_ssl;
+            $http_host_env = (Jifty->web->is_ssl ? "https" : "http") ."://$http_host_env";
         }
         $uri = URI->new($http_host_env);
         if ($dirty && (my $req_uri_env = $ENV{REQUEST_URI})) {