Merge pull request zendframework/zendframework#2142 from padraic/test…

…/PR-2122 Patch+Test for PR-2122: Fix extra values extraction from ContentType header (Zend\Mail)
zendframework · Aug 9, 2012 · eb7f4fc · eb7f4fc
commit eb7f4fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -48,7 +48,7 @@ public static function fromString($headerLine)
 
         if (count($values)) {
             foreach ($values as $keyValuePair) {
-                list($key, $value) = explode('=', $keyValuePair);
+                list($key, $value) = explode('=', $keyValuePair, 2);
                 $value = trim($value, "'\" \t\n\r\0\x0B");
                 $header->addParameter($key, $value);
             }

diff --git a/test/Header/ContentTypeTest.php b/test/Header/ContentTypeTest.php
@@ -59,5 +59,14 @@ public function testProvidingParametersIntroducesHeaderFolding()
         $this->assertContains(";\r\n charset=\"us-ascii\"", $string);
     }
 
+    public function testExtractsExtraInformationFromContentType()
+    {
+        $contentTypeHeader = ContentType::fromString(
+            'Content-Type: multipart/alternative; boundary="Apple-Mail=_1B852F10-F9C6-463D-AADD-CD503A5428DD"'
+        );
+        $params = $contentTypeHeader->getParameters();
+        $this->assertEquals($params,array('boundary' => 'Apple-Mail=_1B852F10-F9C6-463D-AADD-CD503A5428DD'));
+    }
+
 }