Commit a6123508 by mmn

Use config site/sslproxy to force HTTPS (i.e. using reverse proxy to enable it)

Usage in config.php: $config['site']['sslproxy'] = true; Add this to documentation...
parent ec257d94
......@@ -266,10 +266,8 @@ function main()
$args = $r->map($path);
$site_ssl = common_config('site', 'ssl');
// If the request is HTTP and it should be HTTPS...
if ($site_ssl != 'never' && !GNUsocial::isHTTPS() && common_is_sensitive($args['action'])) {
if (GNUsocial::useHTTPS() && !GNUsocial::isHTTPS()) {
common_redirect(common_local_url($args['action'], $args));
}
......
......@@ -56,6 +56,7 @@ $default =
'inviteonly' => true,
'private' => false,
'ssl' => 'never',
'sslproxy' => false, // set to true to force GNU social to think it is HTTPS (i.e. using reverse proxy to enable it)
'sslserver' => null,
'dupelimit' => 60, // default for same person saying the same thing
'textlimit' => 1000, // in chars; 0 == no limit
......
......@@ -426,6 +426,10 @@ class GNUsocial
static function isHTTPS()
{
if (common_config('site', 'sslproxy')) {
return true;
}
// There are some exceptions to this; add them here!
if (empty($_SERVER['HTTPS'])) {
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment