From 1ea7a6bada66fc9b7a45f61b4892e4ea23196d89 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 28 Jul 2012 14:55:45 +0200
Subject: support CONNECT for tunneling SSL via HTTP proxies FS#2431

The included test cases currently expect a squid at localhost:3128
---
 _test/tests/inc/httpclient_http_proxy.test.php  | 19 +++++++++++++++++++
 _test/tests/inc/httpclient_https.test.php       |  1 +
 _test/tests/inc/httpclient_https_proxy.test.php | 15 +++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 _test/tests/inc/httpclient_http_proxy.test.php
 create mode 100644 _test/tests/inc/httpclient_https_proxy.test.php

(limited to '_test')

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
new file mode 100644
index 000000000..81abdbca0
--- /dev/null
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -0,0 +1,19 @@
+<?php
+
+class httpclient_http_proxy_test extends DokuWikiTest {
+    protected $url = 'http://www.dokuwiki.org/README';
+
+    /**
+     * @group internet
+     */
+    function test_simpleget(){
+        $http = new HTTPClient();
+        $http->proxy_host = 'localhost'; //FIXME we need a public server
+        $http->proxy_port = 3128;
+
+        $data = $http->get($this->url);
+        $this->assertFalse($data === false, 'HTTP response');
+        $this->assertTrue(strpos($data,'DokuWiki') !== false, 'response content');
+    }
+
+}
\ No newline at end of file
diff --git a/_test/tests/inc/httpclient_https.test.php b/_test/tests/inc/httpclient_https.test.php
index 26a0f86db..955d467ec 100644
--- a/_test/tests/inc/httpclient_https.test.php
+++ b/_test/tests/inc/httpclient_https.test.php
@@ -1,4 +1,5 @@
 <?php
+require_once dirname(__FILE__).'/httpclient_http.test.php';
 
 class httpclient_https_test extends httpclient_http_test {
     protected $server = 'https://httpbin.org/';
diff --git a/_test/tests/inc/httpclient_https_proxy.test.php b/_test/tests/inc/httpclient_https_proxy.test.php
new file mode 100644
index 000000000..aca3b3be2
--- /dev/null
+++ b/_test/tests/inc/httpclient_https_proxy.test.php
@@ -0,0 +1,15 @@
+<?php
+require_once dirname(__FILE__).'/httpclient_http_proxy.test.php';
+
+class httpclient_https_proxy_test extends httpclient_http_proxy_test {
+    protected $url = 'https://www.dokuwiki.org/README';
+
+    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();
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From a20ce704cbd26eccbca8bf01dadac23a1432e1a5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 8 Nov 2012 23:24:57 +0100
Subject: changed proxy in test case

---
 _test/tests/inc/httpclient_http_proxy.test.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '_test')

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index 81abdbca0..faa7a4280 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -8,8 +8,9 @@ class httpclient_http_proxy_test extends DokuWikiTest {
      */
     function test_simpleget(){
         $http = new HTTPClient();
-        $http->proxy_host = 'localhost'; //FIXME we need a public server
-        $http->proxy_port = 3128;
+        // proxy provided by  Andrwe Lord Weber <dokuwiki@andrwe.org>
+        $http->proxy_host = 'proxy.andrwe.org';
+        $http->proxy_port = 8080;
 
         $data = $http->get($this->url);
         $this->assertFalse($data === false, 'HTTP response');
-- 
cgit v1.2.3