Permalink
Browse files

Fixes #9240, this honors the HTTP_X_FORWARDED_PROTO header for ssl co…

…nnections correctly now
  • Loading branch information...
1 parent 7cb9061 commit 79b92f638ef084c1fd79183a5e4e88bf9e2f88d7 @kormoc kormoc committed Dec 21, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 includes/defines.php
View
@@ -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://';

0 comments on commit 79b92f6

Please sign in to comment.