merge master in branch

1 files changed, 24 insertions, 0 deletions

diff --git a/_test/tests/inc/httpclient_http.test.php b/_test/tests/inc/httpclient_http.test.php
index 9959a1f06..387eb53aa 100644
--- a/_test/tests/inc/httpclient_http.test.php
+++ b/_test/tests/inc/httpclient_http.test.php
@@ -134,6 +134,19 @@ class httpclient_http_test extends DokuWikiTest {
     /**
      * @group internet
      */
+    function test_maxbodyok(){
+        $http = new HTTPClient();
+        $http->max_bodysize = 500*1024;
+        $data = $http->get($this->server.'/stream/5');
+        $this->assertTrue($data !== false, 'HTTP response');
+        $http->max_bodysize_abort = false;
+        $data = $http->get($this->server.'/stream/5');
+        $this->assertTrue($data !== false, 'HTTP response');
+    }
+
+    /**
+     * @group internet
+     */
     function test_basicauth(){
         $http = new HTTPClient();
         $http->user = 'user';
@@ -191,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 :