#634 Detection of HTTPS not working with nginx (iTop always considering the current connection as being secure)

SVN:trunk[2617]
This commit is contained in:
Romain Quetiez
2013-03-13 13:57:51 +00:00
parent 3cf398618e
commit b38dea4bba
6 changed files with 26 additions and 20 deletions

View File

@@ -24,10 +24,8 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('itopsoaptypes.class.inc.php');
$sItopRoot = 'http'.((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off')) ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
$sItopRoot = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
$sWsdlUri = $sItopRoot.'/webservices/itop.wsdl.php';
//$sWsdlUri .= '?service_category=';