Item10669: rewrite 'http(s?)://localhost:123' to {DefaultUrlHost} _IF…

…_ {RemovePortNumber} is set _and_ the protocol matches that in {DefaultUrlHost}.

I'm unsure what should happen if the incoming protocol != the default one, so I'm punting.

git-svn-id: http://svn.foswiki.org/branches/Release01x01@14272 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

core/lib/Foswiki.pm

@@ -1742,8 +1742,12 @@ sub new {
         # useful than the default url host. This is because new CGI("")
         # assigns this host by default - it's a default setting, used
         # when there is nothing better available.
-        if ( $this->{urlHost} eq 'http://localhost' ) {
-            $this->{urlHost} = $Foswiki::cfg{DefaultUrlHost};
+        if ( $this->{urlHost} =~ /(https?):\/\/localhost/i ) {
+            my $protocol = $1;
+            #only replace localhost _if_ the protocol matches the one specified in the DefaultUrlHost
+            if ($Foswiki::cfg{DefaultUrlHost} =~ /^$protocol/i ) {
+                $this->{urlHost} = $Foswiki::cfg{DefaultUrlHost};
+            }
         }
     }
     else {