Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

1 files changed, 15 insertions, 0 deletions

diff --git a/_test/tests/inc/httpclient_https.test.php b/_test/tests/inc/httpclient_https.test.php
new file mode 100644
index 000000000..26a0f86db
--- /dev/null
+++ b/_test/tests/inc/httpclient_https.test.php
@@ -0,0 +1,15 @@
+<?php
+
+class httpclient_https_test extends httpclient_http_test {
+    protected $server = 'https://httpbin.org/';
+
+    public function setUp(){
+        // skip tests when this PHP has no SSL support
+        $transports = stream_get_transports();
+        if(!in_array('ssl',$transports)){
+            $this->markTestSkipped('No SSL support available.');
+        }
+        parent::setUp();
+    }
+}
+//Setup VIM: ex: et ts=4 :