From 79b92f638ef084c1fd79183a5e4e88bf9e2f88d7 Mon Sep 17 00:00:00 2001 From: Rob Smith Date: Mon, 20 Dec 2010 19:38:18 -0800 Subject: [PATCH] Fixes #9240, this honors the HTTP_X_FORWARDED_PROTO header for ssl connections correctly now --- includes/defines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/defines.php b/includes/defines.php index 32efa94c5..e2899c283 100644 --- a/includes/defines.php +++ b/includes/defines.php @@ -97,7 +97,7 @@ $_SERVER['HTTP_HOST'] = $host; $_SERVER['HTTP_PORT'] = $port; - if ($_SERVER['HTTP_PORT'] == '443' || $_SERVER['HTTP_PORT'] == '8443') + if ($_SERVER['HTTP_PORT'] == '443' || $_SERVER['HTTP_PORT'] == '8443' || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') $_SERVER['HTTPS'] = 'on'; $root_url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';