gistfile1.diff

diff --git a/merb-core/lib/merb-core/dispatch/request_parsers.rb b/merb-core/lib
/merb-core/dispatch/request_parsers.rb
index f04eb7a..071eb33 100644
--- a/merb-core/lib/merb-core/dispatch/request_parsers.rb
+++ b/merb-core/lib/merb-core/dispatch/request_parsers.rb
@@ -59,8 +59,8 @@ module Merb
       status = input.read(boundary_size)
       return {} if status == nil || status.empty?
       raise ControllerExceptions::MultiPartParseError, "bad content body:\n'#{s
tatus}' should == '#{boundary + EOL}'"  unless status == boundary + EOL
-      # second argument to Regexp.quote is for KCODE
-      rx = /(?:#{EOL})?#{Regexp.quote(boundary,'n')}(#{EOL}|--)/
+
+      rx = /(?:#{EOL})?#{Regexp.quote(boundary)}(#{EOL}|--)/
       loop {
         head      = nil
         body      = ''