Changeset 3404


Ignore:
Timestamp:
Jun 9, 2009, 5:55:21 PM (11 years ago)
Author:
nikrou
Message:

merge from trunk;bug fix 1024 : the way to discover protocol (http/https) was not correct

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/include/functions_url.inc.php

    r3127 r3404  
    5959  if ($with_scheme)
    6060  {
    61     if (empty($_SERVER['HTTPS']))
     61    if (isset($_SERVER['HTTPS']) &&
     62        ((strtolower($_SERVER['HTTPS']) == 'on') or ($_SERVER['HTTPS'] == 1)))
     63    {
     64      $url .= 'https://';
     65    }
     66    else
    6267    {
    6368      $url .= 'http://';
    64     }
    65     else
    66     {
    67       $url .= 'https://';
    6869    }
    6970    $url .= $_SERVER['HTTP_HOST'];
Note: See TracChangeset for help on using the changeset viewer.