summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-03-05 17:29:46 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-03-05 17:29:46 +0000
commitaa9b35a2f902d0bbcd2ed795af1f6cfa2534bc91 (patch)
tree7ea061fbca49fa2a0641d9781002ac77ae360e4c
parent61a2044958b86db0ab3e304adb3c3752f3fdccd2 (diff)
Add a note that 'use_https' and 'force_https' are mutually exclusive
git-svn-id: https://svn.roundcube.net/trunk@5965 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/config/main.inc.php.dist1
1 files changed, 1 insertions, 0 deletions
diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist
index 27e36c19d..1d3a78af7 100644
--- a/roundcubemail/config/main.inc.php.dist
+++ b/roundcubemail/config/main.inc.php.dist
@@ -195,6 +195,7 @@ $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
+// this option is mutually exclusive to 'force_https' and only either one of them should be set to true.
$rcmail_config['use_https'] = false;
// Allow browser-autocompletion on login form.