diff options
| author | Arthur <arthur@hoa.ro> | 2016-03-01 12:15:10 +0100 |
|---|---|---|
| committer | Arthur <arthur@hoa.ro> | 2016-03-01 12:15:10 +0100 |
| commit | 6e7a3210c3ec2b70b748d513bbd5168a887bf0ea (patch) | |
| tree | 0513dad3f290e1e5d41c0760d24aa96a7590c2ce /tests | |
| parent | 8710d4da8e21b31a90bdcaed10521e0b937cf6c2 (diff) | |
| parent | 85244fa0d06eec620f8476817f68d8ea2dca0e38 (diff) | |
| download | Shaarli-6e7a3210c3ec2b70b748d513bbd5168a887bf0ea.tar.gz Shaarli-6e7a3210c3ec2b70b748d513bbd5168a887bf0ea.tar.zst Shaarli-6e7a3210c3ec2b70b748d513bbd5168a887bf0ea.zip | |
Merge pull request #505 from ArthurHoaro/hotfix/multi-reverse-proxy
Fixes #477: support multi reverse proxy with comma syntax
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/HttpUtils/ServerUrlTest.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/HttpUtils/ServerUrlTest.php b/tests/HttpUtils/ServerUrlTest.php index 5096db65..8a55a220 100644 --- a/tests/HttpUtils/ServerUrlTest.php +++ b/tests/HttpUtils/ServerUrlTest.php | |||
| @@ -67,6 +67,19 @@ class ServerUrlTest extends PHPUnit_Framework_TestCase | |||
| 67 | ) | 67 | ) |
| 68 | ) | 68 | ) |
| 69 | ); | 69 | ); |
| 70 | |||
| 71 | $this->assertEquals( | ||
| 72 | 'https://host.tld:4974', | ||
| 73 | server_url( | ||
| 74 | array( | ||
| 75 | 'HTTPS' => 'Off', | ||
| 76 | 'SERVER_NAME' => 'host.tld', | ||
| 77 | 'SERVER_PORT' => '80', | ||
| 78 | 'HTTP_X_FORWARDED_PROTO' => 'https, https', | ||
| 79 | 'HTTP_X_FORWARDED_PORT' => '4974, 80' | ||
| 80 | ) | ||
| 81 | ) | ||
| 82 | ); | ||
| 70 | } | 83 | } |
| 71 | 84 | ||
| 72 | /** | 85 | /** |