Fixes to accept media exceptions

AppStateESS · Aug 23, 2017 · 794b5f1 · 794b5f1
1 parent ad40763
commit 794b5f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src-phpws2/src/Http/Accept.php b/src-phpws2/src/Http/Accept.php
@@ -30,7 +30,7 @@ public function __construct($acceptStr)
         $this->mediaRanges = array();
         foreach(explode(',', $acceptStr) as $mediaRange) {
             $acceptParams = explode(';', $mediaRange);
-            $contentType = array_shift($acceptParams);
+            $contentType = trim(array_shift($acceptParams));
             $priority = -1.0;
             $params = array();
 

diff --git a/src-phpws2/src/Http/AcceptMediaRange.php b/src-phpws2/src/Http/AcceptMediaRange.php
@@ -21,7 +21,12 @@ class AcceptMediaRange
 
     public function __construct($contentType, $priority, $params)
     {
-        list($this->type, $this->subtype) = explode(self::TYPESEP, $contentType);
+        if ($contentType !== self::WILDCARD) {
+            list($this->type, $this->subtype) = explode(self::TYPESEP, $contentType);
+        } else {
+            $this->type = self::WILDCARD;
+            $this->subtype = self::WILDCARD;
+        }
         $this->priority    = $priority;
         $this->params      = $params;
     }