diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-11-20 12:47:27 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-11-20 12:47:27 +0100 |
| commit | 6a08fca3636f229c6d617da9ea8cad653e533e88 (patch) | |
| tree | 020dc76e3622ecf90898569952704fc4e83c8078 /tests | |
| parent | 10d0883da9fdaab5c13bb9dd52f7fb180310a5bc (diff) | |
| parent | 260a084d27a0015053f7d1c68652d1c573da950d (diff) | |
| download | nextcloud-server-6a08fca3636f229c6d617da9ea8cad653e533e88.tar.gz nextcloud-server-6a08fca3636f229c6d617da9ea8cad653e533e88.zip | |
Merge pull request #12253 from owncloud/port-12154
Port 12154
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/request.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/lib/request.php b/tests/lib/request.php index b89bf92ece7..2760377fa48 100644 --- a/tests/lib/request.php +++ b/tests/lib/request.php @@ -240,7 +240,7 @@ class Test_Request extends PHPUnit_Framework_TestCase { } public function trustedDomainDataProvider() { - $trustedHostTestList = array('host.one.test:8080', 'host.two.test:8080'); + $trustedHostTestList = array('host.one.test', 'host.two.test', '[1fff:0:a88:85a3::ac1f]'); return array( // empty defaults to true array(null, 'host.one.test:8080', true), @@ -249,8 +249,12 @@ class Test_Request extends PHPUnit_Framework_TestCase { // trust list when defined array($trustedHostTestList, 'host.two.test:8080', true), - array($trustedHostTestList, 'host.two.test:9999', false), + array($trustedHostTestList, 'host.two.test:9999', true), array($trustedHostTestList, 'host.three.test:8080', false), + array($trustedHostTestList, 'host.two.test:8080:aa:222', false), + array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]', true), + array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801', true), + array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801:34', false), // trust localhost regardless of trust list array($trustedHostTestList, 'localhost', true), |