Merge pull request #87 from tapmantwo/master

Improve content disposition header parsing.

src/OpenRasta.Tests.Unit/Web/HttpHeaders_Specification.cs

@@ -42,6 +42,14 @@ public void the_filename_parameter_is_parsed()
                 ShouldBe("test");
         }
 
+        [Test]
+        public void fields_can_contain_semi_colons()
+        {
+            var header = new ContentDispositionHeader("form-data;filename=\"test;name\"");
+            header.FileName.
+                ShouldBe("test;name");
+        }
+
         [Test]
         public void the_first_value_is_the_disposition()
         {

src/OpenRasta/Web/ContentDispositionHeader.cs

@@ -9,16 +9,21 @@
 #endregion
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using OpenRasta.Text;
 
 namespace OpenRasta.Web
 {
     public class ContentDispositionHeader: IEquatable<ContentDispositionHeader>
     {
+        private static readonly Regex SplitReg = new Regex(";(?=([^\"]*\"[^\"]*\")*[^\"]*$)", RegexOptions.Compiled);
+
         public ContentDispositionHeader(string header)
         {
-            var fragments = header.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+            var fragments = SplitReg.Split(header).Where(f => !string.IsNullOrEmpty(f)).ToArray();
+
             if (fragments.Length == 0)
                 throw new FormatException("The header value {0} is invalid for Content-Disposition.".With(header));
             Disposition = fragments[0].Trim();