diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-10-11 21:00:33 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-10-11 21:00:33 +0200 |
| commit | 2c01fe67e9313565741f20d207ffb289b1d0b2d3 (patch) | |
| tree | 0359ae3283bd18e8f7b2888531a66379a6d7c06b /phpBB | |
| parent | 2f799fa9939647d890bbb9584a3ee39d2dafce17 (diff) | |
| parent | 7b489638d77edeec58a1e055ad329e517c1bf6e4 (diff) | |
| download | forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar.gz forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar.bz2 forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar.xz forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.zip | |
Merge pull request #4942 from rubencm/ticket/15172
[ticket/15172] Fix redirection to wrong port
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6a36210dca..43d8cce3c4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1644,7 +1644,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false, */ function generate_board_url($without_script_path = false) { - global $config, $user, $request; + global $config, $user, $request, $symfony_request; $server_name = $user->host; @@ -1661,7 +1661,8 @@ function generate_board_url($without_script_path = false) } else { - $server_port = $request->server('SERVER_PORT', 0); + $server_port = (int) $symfony_request->getPort(); + $forwarded_proto = $request->server('HTTP_X_FORWARDED_PROTO'); if (!empty($forwarded_proto) && $forwarded_proto === 'https') |