From 69e58d8632198cf3eb39317d9382007731a10141 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 4 May 2011 07:24:52 +0200 Subject: [PATCH] Support HTTPS connections when $root is not configured --- doc/ChangeLog | 1 + src/SemanticScuttle/constants.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index dacee5a..d9b6f57 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -15,6 +15,7 @@ ChangeLog for SemantiScuttle - api/posts/add respects the "replace" parameter now - Fix privacy issue when fetching tags of several users - Only URLs with an allowed protocol may be added to the database +- Support HTTPS connections when $root is not configured 0.97.2 - 2011-02-17 diff --git a/src/SemanticScuttle/constants.php b/src/SemanticScuttle/constants.php index b023840..f8567d9 100644 --- a/src/SemanticScuttle/constants.php +++ b/src/SemanticScuttle/constants.php @@ -41,7 +41,10 @@ if (!isset($GLOBALS['root'])) { $rootTmp .= '/'; } - define('ROOT', 'http://'. $_SERVER['HTTP_HOST'] . $rootTmp); + //we do not prepend http since we also want to support https connections + // "http" is not required; it's automatically determined by the browser + // depending on the current connection. + define('ROOT', '//'. $_SERVER['HTTP_HOST'] . $rootTmp); } else { define('ROOT', $GLOBALS['root']); }