diff options
author | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
---|---|---|
committer | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
commit | af07997c5ff7cc096965159d90158e3710d2d019 (patch) | |
tree | defaf770e77a679436eb56291185905b547640d0 /_test/tests/inc/httpclient_http.test.php | |
parent | bdac741579f8c6f00248d5d3ec635d4c2e08fb1e (diff) | |
parent | 7d8a6abbb21979fd77dca10275ebb8e01a04b6e4 (diff) | |
download | rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.gz rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.bz2 |
Merge branch 'master' into configmgr_improvements
Conflicts:
inc/auth.php
inc/template.php
lib/plugins/authad/lang/zh/settings.php
lib/plugins/authldap/lang/en/settings.php
lib/plugins/authldap/lang/zh/settings.php
lib/plugins/authmysql/lang/zh/settings.php
lib/plugins/config/settings/config.class.php
lib/plugins/usermanager/admin.php
Diffstat (limited to '_test/tests/inc/httpclient_http.test.php')
-rw-r--r-- | _test/tests/inc/httpclient_http.test.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/_test/tests/inc/httpclient_http.test.php b/_test/tests/inc/httpclient_http.test.php index 252eb6b65..387eb53aa 100644 --- a/_test/tests/inc/httpclient_http.test.php +++ b/_test/tests/inc/httpclient_http.test.php @@ -204,5 +204,16 @@ class httpclient_http_test extends DokuWikiTest { $this->assertFalse($data === false, 'HTTP response'); $this->assertEquals(2550,strlen($data)); } + + /** + * This address caused trouble with stream_select() + * + * @group internet + */ + function test_wikimatrix(){ + $http = new HTTPClient(); + $data = $http->get('http://www.wikimatrix.org/cfeed/dokuwiki/-/-'); + $this->assertTrue($data !== false, $http->error); + } } //Setup VIM: ex: et ts=4 : |