Changed Content-Disposition: multipart/form-data to Content-Disposition: form-data per rfc 2388

history.md

@@ -1,10 +1,11 @@
-# 1.2.1
+# 1.3.0
 
 - a block can be used to process a request's result, this enable to handle custom error codes or paththrought (design by Cyril Rohr)
 - cleaner log API, add a warning for some cases but should be compatible
 - accept multiple "Set-Cookie" headers, see http://www.ietf.org/rfc/rfc2109.txt (patch provided by Cyril Rohr)
 - remove "Content-Length" and "Content-Type" headers when following a redirection (patch provided by haarts)
 - all http error codes have now a corresponding exception class and all of them contain the Reponse
+- changed "Content-Disposition: multipart/form-data" to "Content-Disposition: form-data" per RFC 2388 (patch provided by Kyle Crawford)
 
 # 1.2.0
 

lib/restclient/payload.rb

@@ -138,7 +138,7 @@ module RestClient
       end
 
       def create_regular_field(s, k, v)
-        s.write("Content-Disposition: multipart/form-data; name=\"#{k}\"")
+        s.write("Content-Disposition: form-data; name=\"#{k}\"")
         s.write(EOL)
         s.write(EOL)
         s.write(v)
@@ -146,7 +146,7 @@ module RestClient
 
       def create_file_field(s, k, v)
         begin
-          s.write("Content-Disposition: multipart/form-data; name=\"#{k}\"; filename=\"#{v.respond_to?(:original_filename) ? v.original_filename : File.basename(v.path)}\"#{EOL}")
+          s.write("Content-Disposition: form-data; name=\"#{k}\"; filename=\"#{v.respond_to?(:original_filename) ? v.original_filename : File.basename(v.path)}\"#{EOL}")
           s.write("Content-Type: #{v.respond_to?(:content_type) ? v.content_type : mime_for(v.path)}#{EOL}")
           s.write(EOL)
           while data = v.read(8124)

spec/payload_spec.rb

@@ -39,11 +39,11 @@ describe RestClient::Payload do
       m = RestClient::Payload::Multipart.new([[:bar, "baz"], [:foo, "bar"]])
       m.to_s.should == <<-EOS
 --#{m.boundary}\r
-Content-Disposition: multipart/form-data; name="bar"\r
+Content-Disposition: form-data; name="bar"\r
 \r
 baz\r
 --#{m.boundary}\r
-Content-Disposition: multipart/form-data; name="foo"\r
+Content-Disposition: form-data; name="foo"\r
 \r
 bar\r
 --#{m.boundary}--\r
@@ -55,7 +55,7 @@ bar\r
       m = RestClient::Payload::Multipart.new({:foo => f})
       m.to_s.should == <<-EOS
 --#{m.boundary}\r
-Content-Disposition: multipart/form-data; name="foo"; filename="master_shake.jpg"\r
+Content-Disposition: form-data; name="foo"; filename="master_shake.jpg"\r
 Content-Type: image/jpeg\r
 \r
 #{IO.read(f.path)}\r
@@ -70,7 +70,7 @@ Content-Type: image/jpeg\r
       m = RestClient::Payload::Multipart.new({:foo => f})
       m.to_s.should == <<-EOS
 --#{m.boundary}\r
-Content-Disposition: multipart/form-data; name="foo"; filename="foo.txt"\r
+Content-Disposition: form-data; name="foo"; filename="foo.txt"\r
 Content-Type: text/plain\r
 \r
 #{IO.read(f.path)}\r
@@ -82,7 +82,7 @@ Content-Type: text/plain\r
       m = RestClient::Payload::Multipart.new({:bar => {:baz => "foo"}})
       m.to_s.should == <<-EOS
 --#{m.boundary}\r
-Content-Disposition: multipart/form-data; name="bar[baz]"\r
+Content-Disposition: form-data; name="bar[baz]"\r
 \r
 foo\r
 --#{m.boundary}--\r
@@ -94,7 +94,7 @@ foo\r
       m = RestClient::Payload::Multipart.new({:foo => {:bar => f}})
       m.to_s.should == <<-EOS
 --#{m.boundary}\r
-Content-Disposition: multipart/form-data; name="foo[bar]"; filename="foo.txt"\r
+Content-Disposition: form-data; name="foo[bar]"; filename="foo.txt"\r
 Content-Type: text/plain\r
 \r
 #{IO.read(f.path)}\r