[mms] Fopen driver needs to handle URIs without a protocol scheme - d…

…efault to http (Bug #12991).
horde · Feb 24, 2014 · 25f1b4c · 25f1b4c
1 parent ea572ca
commit 25f1b4c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/framework/Http/lib/Horde/Http/Request/Fopen.php b/framework/Http/lib/Horde/Http/Request/Fopen.php
@@ -87,6 +87,11 @@ public function send()
             }
         }
 
+        // fopen() requires a protocol scheme
+        if (parse_url($uri, PHP_URL_SCHEME) === null) {
+            $uri = 'http://' . $uri;
+        }
+
         // Concatenate the headers
         $hdr = array();
         foreach ($headers as $header => $value) {

diff --git a/framework/Http/package.xml b/framework/Http/package.xml
@@ -29,7 +29,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [mms] Fopen driver needs to handle URIs without a protocol scheme - default to http (Bug #12991).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -430,7 +430,7 @@
    <date>2013-08-27</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [mms] Fopen driver needs to handle URIs without a protocol scheme - default to http (Bug #12991).
    </notes>
   </release>
  </changelog>

diff --git a/framework/Http/test/Horde/Http/FopenTest.php b/framework/Http/test/Horde/Http/FopenTest.php
@@ -80,6 +80,17 @@ public function testGetBodyAfter404()
         $this->assertTrue(strlen($body) > 0);
     }
 
+    public function testBug12991()
+    {
+        $this->_skipMissingConfig();
+        $client = new Horde_Http_Client(array(
+            'request' => new Horde_Http_Request_Fopen()
+        ));
+        $response = $client->get($this->_server . '/doesntexist');
+        $body = $response->getBody();
+        $this->assertTrue(strlen($body) > 0);
+    }
+
     private function _skipMissingConfig()
     {
         if (empty($this->_server)) {