Correct the regex for finding the part name by Content-Id header. Fix…

…es issue rack#98 at rack/rack

Signed-off-by: raggi <jftucker@gmail.com>

lib/rack/utils.rb

@@ -507,7 +507,7 @@ def method_missing(method_name, *args, &block) #:nodoc:
       BROKEN_UNQUOTED = /^#{CONDISP}.*;\sfilename=(#{TOKEN})/i
       MULTIPART_CONTENT_TYPE = /Content-Type: (.*)#{EOL}/ni
       MULTIPART_CONTENT_DISPOSITION = /Content-Disposition:.*\s+name="?([^\";]*)"?/ni
-      MULTIPART_CONTENT_ID = /Content-ID:([^#{EOL}]*)/ni
+      MULTIPART_CONTENT_ID = /Content-ID:\s*([^#{EOL}]*)/ni
 
       def self.parse_multipart(env)
         unless env['CONTENT_TYPE'] =~ MULTIPART

test/spec_request.rb

@@ -550,6 +550,24 @@
 
     lambda { req.POST }.should.raise(EOFError)
   end
+
+  should "correctly parse the part name from Content-Id header" do
+    input = <<EOF
+--AaB03x\r
+Content-Type: text/xml; charset=utf-8\r
+Content-Id: <soap-start>\r
+Content-Transfer-Encoding: 7bit\r
+\r
+foo\r
+--AaB03x--\r
+EOF
+    req = Rack::Request.new Rack::MockRequest.env_for("/",
+                      "CONTENT_TYPE" => "multipart/related, boundary=AaB03x",
+                      "CONTENT_LENGTH" => input.size,
+                      :input => input)
+
+    req.params.keys.should.equal ["<soap-start>"]
+  end
 
   should "not try to interpret binary as utf8" do
     if /regexp/.respond_to?(:kcode) # < 1.9