- Add description of 'use_https' option in main.inc.php.dist file

2 files changed, 6 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index bd31a8a36..9abcab0d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
 - Add handling of multifolder METADATA/ANNOTATION responses
 - Fix handling of INBOX when personal namespace prefix is non-empty (#1487657)
 - Fix handling square brackets in links (#1487672)
+- Add description of 'use_https' option in main.inc.php.dist file
 
 RELEASE 0.5-RC
 --------------
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index e2f9aea3b..144ca77b6 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -181,6 +181,11 @@ $rcmail_config['message_cache_lifetime'] = '10d';
 // set the port for the ssl connection as value of this option if it differs from the default 443
 $rcmail_config['force_https'] = false;
 
+// tell PHP that it should work as under secure connection
+// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set)
+// e.g. when you're running Roundcube behind a https proxy
+$rcmail_config['use_https'] = false;
+
 // Allow browser-autocompletion on login form.
 // 0 - disabled, 1 - username and host only, 2 - username, host, password
 $rcmail_config['login_autocomplete'] = 0;