Changeset 2463

Timestamp:

05/20/2008 05:57:37 AM (5 months ago)

Author:

tof

Message:

Fixed #847

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• framework/Web/THttpRequest.php (modified) (1 diff)

trunk/HISTORY

@@ -3 +3 @@
 BUG: Ticket#836 - TRatingList downgrade (Christophe)
 BUG: Ticket#841 - Strange output from THttpResponse (Christophe)
+BUG: Ticket#847 - getBaseUrl sometimes fails (Christophe)
 BUG: Ticket#843 - TDataList alternatinItem issue after changes in rev 2227 (Christophe)
 BUG: Ticket#849 - TDatePicker selecting current date problem (Christophe)

trunk/framework/Web/THttpRequest.php

@@ -367 +367 @@
         public function getBaseUrl($forceSecureConnection=false)
         {
-                $secure=$this->getIsSecureConnection() || $forceSecureConnection;
-                $url=($secure ? "https://" : "http://") . $_SERVER ['HTTP_HOST'];
-                $port=$_SERVER['SERVER_PORT'];
-                if(($port!=80 && !$secure) || ($port!=443 && $secure))
-                        $url.=':'.$port;
-                return $url;
+                $url=$this->getUrl();
+                $scheme=($forceSecureConnection)?"https":$url->getScheme();
+                $host=$url->getHost();
+                if (($port=$url->getPort())) $host.=':'.$port;
+                return $scheme.'://'.$host;
         }