Merge branch 'hotfix/4224'

Close #4224
zendframework · Apr 15, 2013 · ee0bd4d · ee0bd4d
2 parents b725fb4 + e6476a5
commit ee0bd4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/library/Zend/Mail/Header/GenericHeader.php b/library/Zend/Mail/Header/GenericHeader.php
@@ -76,9 +76,9 @@ public function setFieldName($fieldName)
         $fieldName = str_replace(' ', '-', ucwords(str_replace(array('_', '-'), ' ', $fieldName)));
 
         // Validate what we have
-        if (!preg_match('/^[a-z][a-z0-9-]*$/i', $fieldName)) {
+        if (!preg_match('/^[\x21-\x39\x3B-\x7E]*$/i', $fieldName)) {
             throw new Exception\InvalidArgumentException(
-                'Header name must start with a letter, and consist of only letters, numbers and dashes.'
+                'Header name must be composed of printable US-ASCII characters, except colon.'
             );
         }
 

diff --git a/library/Zend/Mail/Headers.php b/library/Zend/Mail/Headers.php
@@ -70,7 +70,7 @@ public static function fromString($string, $EOL = self::EOL)
         // iterate the header lines, some might be continuations
         foreach (explode($EOL, $string) as $line) {
             // check if a header name is present
-            if (preg_match('/^(?P<name>[^()><@,;:\"\\/\[\]?=}{ \t]+):.*$/', $line, $matches)) {
+            if (preg_match('/^(?P<name>[\x21-\x39\x3B-\x7E]+):.*$/', $line, $matches)) {
                 if ($currentLine) {
                     // a header name was present, then store the current complete line
                     $headers->addHeaderLine($currentLine);