Moved validation of Uri away from non- RFC3986 compliance to the 'Zen…

…d\Uri\UriFactory' method of validation
zendframework · Aug 26, 2013 · 35b19ca · 35b19ca
1 parent e75eab4
commit 35b19ca
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Header/Origin.php b/src/Header/Origin.php
@@ -9,6 +9,8 @@
 
 namespace Zend\Http\Header;
 
+use \Zend\Uri\UriFactory;
+
 /**
  * @throws Exception\InvalidArgumentException
  * @see http://tools.ietf.org/id/draft-abarth-origin-03.html#rfc.section.2
@@ -27,7 +29,8 @@ public static function fromString($headerLine)
             throw new Exception\InvalidArgumentException('Invalid header line for Origin string: "' . $name . '"');
         }
 
-        if (!filter_var($value, FILTER_VALIDATE_URL)) {
+        $uri = UriFactory::factory($value);
+        if (!$uri->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid header value for Origin key: "' . $name . '"');
         }