Merge branch 'hotfix/151'

Close #151

Author: weierophinney

CHANGELOG.md

@@ -22,7 +22,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#151](https://github.com/zendframework/zend-http/pull/151) fixes how Referer and other location-based headers report problems with
+  invalid URLs provided in the header value, raising a `Zend\Http\Exception\InvalidArgumentException`
+  in such cases. This change ensures the behavior is consistent with behavior
+  prior to the 2.8.0 release.
 
 ## 2.8.1 - 2018-08-01
 

src/Header/AbstractLocation.php

@@ -76,6 +76,12 @@ public function setUri($uri)
                     $e->getCode(),
                     $e
                 );
+            } catch (UriException\InvalidArgumentException $e) {
+                throw new Exception\InvalidArgumentException(
+                    sprintf('Invalid URI passed as string (%s)', (string) $uri),
+                    $e->getCode(),
+                    $e
+                );
             }
         } elseif (! ($uri instanceof UriInterface)) {
             throw new Exception\InvalidArgumentException('URI must be an instance of Zend\Uri\Http or a string');

test/Header/RefererTest.php

@@ -9,8 +9,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Zend\Http\Header\Exception\InvalidArgumentException;
+use Zend\Http\Header\GenericHeader;
 use Zend\Http\Header\HeaderInterface;
 use Zend\Http\Header\Referer;
+use Zend\Http\Headers;
 use Zend\Uri\Http;
 use Zend\Uri\Uri;
 
@@ -77,4 +79,17 @@ public function testCRLFAttack()
         $this->expectException(InvalidArgumentException::class);
         Referer::fromString("Referer: http://www.example.com/\r\n\r\nevilContent");
     }
+
+    public function testInvalidUriShouldWrapException()
+    {
+        $headerString = "Referer: unknown-scheme://test";
+
+        $headers = Headers::fromString($headerString);
+
+        $result = $headers->get('Referer');
+
+        $this->assertInstanceOf(GenericHeader::class, $result);
+        $this->assertNotInstanceOf(Referer::class, $result);
+        $this->assertEquals('unknown-scheme://test', $result->getFieldValue());
+    }
 }