RubyGems - actionpack - Versions diffs - 2.3.2 → 2.3.3 - Mend

actionpack 2.3.2 → 2.3.3

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (117) hide show

data/CHANGELOG +5 -0
data/Rakefile +10 -9
data/lib/action_controller.rb +2 -7
data/lib/action_controller/assertions/response_assertions.rb +11 -3
data/lib/action_controller/base.rb +7 -2
data/lib/action_controller/caching.rb +1 -1
data/lib/action_controller/caching/actions.rb +9 -1
data/lib/action_controller/caching/sweeper.rb +45 -0
data/lib/action_controller/caching/sweeping.rb +0 -42
data/lib/action_controller/failsafe.rb +40 -6
data/lib/action_controller/flash.rb +11 -3
data/lib/action_controller/http_authentication.rb +5 -2
data/lib/action_controller/integration.rb +5 -12
data/lib/action_controller/middlewares.rb +0 -1
data/lib/action_controller/reloader.rb +34 -3
data/lib/action_controller/request.rb +6 -2
data/lib/action_controller/response.rb +2 -2
data/lib/action_controller/routing/route_set.rb +2 -1
data/lib/action_controller/streaming.rb +1 -1
data/lib/action_controller/test_process.rb +9 -1
data/lib/action_pack/version.rb +1 -1
data/lib/action_view/helpers.rb +1 -1
data/lib/action_view/helpers/asset_tag_helper.rb +21 -9
data/lib/action_view/helpers/date_helper.rb +2 -2
data/lib/action_view/helpers/form_helper.rb +25 -12
data/lib/action_view/helpers/form_options_helper.rb +2 -0
data/lib/action_view/helpers/form_tag_helper.rb +10 -4
data/lib/action_view/helpers/number_helper.rb +1 -1
data/lib/action_view/helpers/prototype_helper.rb +7 -7
data/lib/action_view/helpers/scriptaculous_helper.rb +5 -5
data/lib/action_view/helpers/text_helper.rb +3 -3
data/lib/action_view/helpers/url_helper.rb +1 -1
data/lib/action_view/paths.rb +1 -1
data/lib/action_view/template.rb +22 -33
data/test/abstract_unit.rb +1 -1
data/test/activerecord/active_record_store_test.rb +3 -3
data/test/controller/action_pack_assertions_test.rb +27 -0
data/test/controller/caching_test.rb +39 -0
data/test/controller/cookie_test.rb +10 -0
data/test/controller/dispatcher_test.rb +9 -7
data/test/controller/failsafe_test.rb +60 -0
data/test/controller/filter_params_test.rb +2 -1
data/test/controller/flash_test.rb +6 -1
data/test/controller/http_digest_authentication_test.rb +34 -3
data/test/controller/integration_test.rb +31 -3
data/test/controller/redirect_test.rb +4 -1
data/test/controller/reloader_test.rb +97 -0
data/test/controller/render_test.rb +19 -9
data/test/controller/request/multipart_params_parsing_test.rb +1 -62
data/test/controller/request/test_request_test.rb +35 -0
data/test/controller/request/url_encoded_params_parsing_test.rb +0 -38
data/test/controller/request_test.rb +218 -230
data/test/controller/resources_test.rb +8 -0
data/test/controller/routing_test.rb +21 -0
data/test/controller/send_file_test.rb +1 -1
data/test/controller/session/cookie_store_test.rb +9 -32
data/test/controller/test_test.rb +8 -0
data/test/fixtures/failsafe/500.html +1 -0
data/test/template/active_record_helper_test.rb +1 -1
data/test/template/asset_tag_helper_test.rb +46 -0
data/test/template/form_helper_test.rb +117 -6
data/test/template/form_options_helper_test.rb +22 -0
data/test/template/form_tag_helper_test.rb +23 -6
data/test/template/prototype_helper_test.rb +11 -11
data/test/template/template_test.rb +32 -0
metadata +20 -63
data/lib/action_controller/rewindable_input.rb +0 -28
data/lib/action_controller/vendor/rack-1.0/rack.rb +0 -89
data/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb +0 -22
data/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb +0 -37
data/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb +0 -37
data/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb +0 -58
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb +0 -124
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb +0 -51
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb +0 -55
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb +0 -40
data/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb +0 -480
data/lib/action_controller/vendor/rack-1.0/rack/builder.rb +0 -63
data/lib/action_controller/vendor/rack-1.0/rack/cascade.rb +0 -36
data/lib/action_controller/vendor/rack-1.0/rack/chunked.rb +0 -49
data/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb +0 -61
data/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb +0 -45
data/lib/action_controller/vendor/rack-1.0/rack/content_length.rb +0 -29
data/lib/action_controller/vendor/rack-1.0/rack/content_type.rb +0 -23
data/lib/action_controller/vendor/rack-1.0/rack/deflater.rb +0 -85
data/lib/action_controller/vendor/rack-1.0/rack/directory.rb +0 -153
data/lib/action_controller/vendor/rack-1.0/rack/file.rb +0 -88
data/lib/action_controller/vendor/rack-1.0/rack/handler.rb +0 -48
data/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb +0 -61
data/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb +0 -8
data/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb +0 -89
data/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb +0 -55
data/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb +0 -84
data/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb +0 -59
data/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb +0 -8
data/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb +0 -18
data/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb +0 -67
data/lib/action_controller/vendor/rack-1.0/rack/head.rb +0 -19
data/lib/action_controller/vendor/rack-1.0/rack/lint.rb +0 -462
data/lib/action_controller/vendor/rack-1.0/rack/lobster.rb +0 -65
data/lib/action_controller/vendor/rack-1.0/rack/lock.rb +0 -16
data/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb +0 -27
data/lib/action_controller/vendor/rack-1.0/rack/mime.rb +0 -204
data/lib/action_controller/vendor/rack-1.0/rack/mock.rb +0 -160
data/lib/action_controller/vendor/rack-1.0/rack/recursive.rb +0 -57
data/lib/action_controller/vendor/rack-1.0/rack/reloader.rb +0 -64
data/lib/action_controller/vendor/rack-1.0/rack/request.rb +0 -241
data/lib/action_controller/vendor/rack-1.0/rack/response.rb +0 -179
data/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb +0 -142
data/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb +0 -91
data/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb +0 -109
data/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb +0 -100
data/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb +0 -349
data/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb +0 -106
data/lib/action_controller/vendor/rack-1.0/rack/static.rb +0 -38
data/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb +0 -55
data/lib/action_controller/vendor/rack-1.0/rack/utils.rb +0 -392

data/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb DELETED

@@ -1,106 +0,0 @@
-require 'erb'
-require 'rack/request'
-require 'rack/utils'
-module Rack
-  # Rack::ShowStatus catches all empty responses the app it wraps and
-  # replaces them with a site explaining the error.
-  #
-  # Additional details can be put into <tt>rack.showstatus.detail</tt>
-  # and will be shown as HTML.  If such details exist, the error page
-  # is always rendered, even if the reply was not empty.
-  class ShowStatus
-    def initialize(app)
-      @app = app
-      @template = ERB.new(TEMPLATE)
-    end
-    def call(env)
-      status, headers, body = @app.call(env)
-      headers = Utils::HeaderHash.new(headers)
-      empty = headers['Content-Length'].to_i <= 0
-      # client or server error, or explicit message
-      if (status.to_i >= 400 && empty) || env["rack.showstatus.detail"]
-        req = Rack::Request.new(env)
-        message = Rack::Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
-        detail = env["rack.showstatus.detail"] || message
-        body = @template.result(binding)
-        size = Rack::Utils.bytesize(body)
-        [status, headers.merge("Content-Type" => "text/html", "Content-Length" => size.to_s), [body]]
-      else
-        [status, headers, body]
-      end
-    end
-    def h(obj)                  # :nodoc:
-      case obj
-      when String
-        Utils.escape_html(obj)
-      else
-        Utils.escape_html(obj.inspect)
-      end
-    end
-    # :stopdoc:
-# adapted from Django <djangoproject.com>
-# Copyright (c) 2005, the Lawrence Journal-World
-# Used under the modified BSD license:
-# http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5
-TEMPLATE = <<'HTML'
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-  <title><%=h message %> at <%=h req.script_name + req.path_info %></title>
-  <meta name="robots" content="NONE,NOARCHIVE" />
-  <style type="text/css">
-    html * { padding:0; margin:0; }
-    body * { padding:10px 20px; }
-    body * * { padding:0; }
-    body { font:small sans-serif; background:#eee; }
-    body>div { border-bottom:1px solid #ddd; }
-    h1 { font-weight:normal; margin-bottom:.4em; }
-    h1 span { font-size:60%; color:#666; font-weight:normal; }
-    table { border:none; border-collapse: collapse; width:100%; }
-    td, th { vertical-align:top; padding:2px 3px; }
-    th { width:12em; text-align:right; color:#666; padding-right:.5em; }
-    #info { background:#f6f6f6; }
-    #info ol { margin: 0.5em 4em; }
-    #info ol li { font-family: monospace; }
-    #summary { background: #ffc; }
-    #explanation { background:#eee; border-bottom: 0px none; }
-  </style>
-</head>
-<body>
-  <div id="summary">
-    <h1><%=h message %> <span>(<%= status.to_i %>)</span></h1>
-    <table class="meta">
-      <tr>
-        <th>Request Method:</th>
-        <td><%=h req.request_method %></td>
-      </tr>
-      <tr>
-        <th>Request URL:</th>
-      <td><%=h req.url %></td>
-      </tr>
-    </table>
-  </div>
-  <div id="info">
-    <p><%= detail %></p>
-  </div>
-  <div id="explanation">
-    <p>
-    You're seeing this error because you use <code>Rack::ShowStatus</code>.
-    </p>
-  </div>
-</body>
-</html>
-HTML
-    # :startdoc:
-  end
-end

data/lib/action_controller/vendor/rack-1.0/rack/static.rb DELETED

@@ -1,38 +0,0 @@
-module Rack
-  # The Rack::Static middleware intercepts requests for static files
-  # (javascript files, images, stylesheets, etc) based on the url prefixes
-  # passed in the options, and serves them using a Rack::File object. This
-  # allows a Rack stack to serve both static and dynamic content.
-  #
-  # Examples:
-  #     use Rack::Static, :urls => ["/media"]
-  #     will serve all requests beginning with /media from the "media" folder
-  #     located in the current directory (ie media/*).
-  #
-  #     use Rack::Static, :urls => ["/css", "/images"], :root => "public"
-  #     will serve all requests beginning with /css or /images from the folder
-  #     "public" in the current directory (ie public/css/* and public/images/*)
-  class Static
-    def initialize(app, options={})
-      @app = app
-      @urls = options[:urls] || ["/favicon.ico"]
-      root = options[:root] || Dir.pwd
-      @file_server = Rack::File.new(root)
-    end
-    def call(env)
-      path = env["PATH_INFO"]
-      can_serve = @urls.any? { |url| path.index(url) == 0 }
-      if can_serve
-        @file_server.call(env)
-      else
-        @app.call(env)
-      end
-    end
-  end
-end

data/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb DELETED

@@ -1,55 +0,0 @@
-module Rack
-  # Rack::URLMap takes a hash mapping urls or paths to apps, and
-  # dispatches accordingly.  Support for HTTP/1.1 host names exists if
-  # the URLs start with <tt>http://</tt> or <tt>https://</tt>.
-  #
-  # URLMap modifies the SCRIPT_NAME and PATH_INFO such that the part
-  # relevant for dispatch is in the SCRIPT_NAME, and the rest in the
-  # PATH_INFO.  This should be taken care of when you need to
-  # reconstruct the URL in order to create links.
-  #
-  # URLMap dispatches in such a way that the longest paths are tried
-  # first, since they are most specific.
-  class URLMap
-    def initialize(map = {})
-      remap(map)
-    end
-    def remap(map)
-      @mapping = map.map { |location, app|
-        if location =~ %r{\Ahttps?://(.*?)(/.*)}
-          host, location = $1, $2
-        else
-          host = nil
-        end
-        unless location[0] == ?/
-          raise ArgumentError, "paths need to start with /"
-        end
-        location = location.chomp('/')
-        [host, location, app]
-      }.sort_by { |(h, l, a)| [-l.size, h.to_s.size] }  # Longest path first
-    end
-    def call(env)
-      path = env["PATH_INFO"].to_s.squeeze("/")
-      script_name = env['SCRIPT_NAME']
-      hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT')
-      @mapping.each { |host, location, app|
-        next unless (hHost == host || sName == host \
-          || (host.nil? && (hHost == sName || hHost == sName+':'+sPort)))
-        next unless location == path[0, location.size]
-        next unless path[location.size] == nil || path[location.size] == ?/
-        return app.call(
-          env.merge(
-            'SCRIPT_NAME' => (script_name + location),
-            'PATH_INFO'   => path[location.size..-1]))
-      }
-      [404, {"Content-Type" => "text/plain"}, ["Not Found: #{path}"]]
-    end
-  end
-end

data/lib/action_controller/vendor/rack-1.0/rack/utils.rb DELETED

@@ -1,392 +0,0 @@
-require 'set'
-require 'tempfile'
-module Rack
-  # Rack::Utils contains a grab-bag of useful methods for writing web
-  # applications adopted from all kinds of Ruby libraries.
-  module Utils
-    # Performs URI escaping so that you can construct proper
-    # query strings faster.  Use this rather than the cgi.rb
-    # version since it's faster.  (Stolen from Camping).
-    def escape(s)
-      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-        '%'+$1.unpack('H2'*$1.size).join('%').upcase
-      }.tr(' ', '+')
-    end
-    module_function :escape
-    # Unescapes a URI escaped string. (Stolen from Camping).
-    def unescape(s)
-      s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
-        [$1.delete('%')].pack('H*')
-      }
-    end
-    module_function :unescape
-    # Stolen from Mongrel, with some small modifications:
-    # Parses a query string by breaking it up at the '&'
-    # and ';' characters.  You can also use this to parse
-    # cookies by changing the characters used in the second
-    # parameter (which defaults to '&;').
-    def parse_query(qs, d = '&;')
-      params = {}
-      (qs || '').split(/[#{d}] */n).each do |p|
-        k, v = unescape(p).split('=', 2)
-        if cur = params[k]
-          if cur.class == Array
-            params[k] << v
-          else
-            params[k] = [cur, v]
-          end
-        else
-          params[k] = v
-        end
-      end
-      return params
-    end
-    module_function :parse_query
-    def parse_nested_query(qs, d = '&;')
-      params = {}
-      (qs || '').split(/[#{d}] */n).each do |p|
-        k, v = unescape(p).split('=', 2)
-        normalize_params(params, k, v)
-      end
-      return params
-    end
-    module_function :parse_nested_query
-    def normalize_params(params, name, v = nil)
-      name =~ %r([\[\]]*([^\[\]]+)\]*)
-      k = $1 || ''
-      after = $' || ''
-      return if k.empty?
-      if after == ""
-        params[k] = v
-      elsif after == "[]"
-        params[k] ||= []
-        raise TypeError unless params[k].is_a?(Array)
-        params[k] << v
-      elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
-        child_key = $1
-        params[k] ||= []
-        raise TypeError unless params[k].is_a?(Array)
-        if params[k].last.is_a?(Hash) && !params[k].last.key?(child_key)
-          normalize_params(params[k].last, child_key, v)
-        else
-          params[k] << normalize_params({}, child_key, v)
-        end
-      else
-        params[k] ||= {}
-        params[k] = normalize_params(params[k], after, v)
-      end
-      return params
-    end
-    module_function :normalize_params
-    def build_query(params)
-      params.map { |k, v|
-        if v.class == Array
-          build_query(v.map { |x| [k, x] })
-        else
-          escape(k) + "=" + escape(v)
-        end
-      }.join("&")
-    end
-    module_function :build_query
-    # Escape ampersands, brackets and quotes to their HTML/XML entities.
-    def escape_html(string)
-      string.to_s.gsub("&", "&amp;").
-        gsub("<", "&lt;").
-        gsub(">", "&gt;").
-        gsub("'", "&#39;").
-        gsub('"', "&quot;")
-    end
-    module_function :escape_html
-    def select_best_encoding(available_encodings, accept_encoding)
-      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-      expanded_accept_encoding =
-        accept_encoding.map { |m, q|
-          if m == "*"
-            (available_encodings - accept_encoding.map { |m2, _| m2 }).map { |m2| [m2, q] }
-          else
-            [[m, q]]
-          end
-        }.inject([]) { |mem, list|
-          mem + list
-        }
-      encoding_candidates = expanded_accept_encoding.sort_by { |_, q| -q }.map { |m, _| m }
-      unless encoding_candidates.include?("identity")
-        encoding_candidates.push("identity")
-      end
-      expanded_accept_encoding.find_all { |m, q|
-        q == 0.0
-      }.each { |m, _|
-        encoding_candidates.delete(m)
-      }
-      return (encoding_candidates & available_encodings)[0]
-    end
-    module_function :select_best_encoding
-    # Return the bytesize of String; uses String#length under Ruby 1.8 and
-    # String#bytesize under 1.9.
-    if ''.respond_to?(:bytesize)
-      def bytesize(string)
-        string.bytesize
-      end
-    else
-      def bytesize(string)
-        string.size
-      end
-    end
-    module_function :bytesize
-    # Context allows the use of a compatible middleware at different points
-    # in a request handling stack. A compatible middleware must define
-    # #context which should take the arguments env and app. The first of which
-    # would be the request environment. The second of which would be the rack
-    # application that the request would be forwarded to.
-    class Context
-      attr_reader :for, :app
-      def initialize(app_f, app_r)
-        raise 'running context does not respond to #context' unless app_f.respond_to? :context
-        @for, @app = app_f, app_r
-      end
-      def call(env)
-        @for.context(env, @app)
-      end
-      def recontext(app)
-        self.class.new(@for, app)
-      end
-      def context(env, app=@app)
-        recontext(app).call(env)
-      end
-    end
-    # A case-insensitive Hash that preserves the original case of a
-    # header when set.
-    class HeaderHash < Hash
-      def initialize(hash={})
-        @names = {}
-        hash.each { |k, v| self[k] = v }
-      end
-      def to_hash
-        inject({}) do |hash, (k,v)|
-          if v.respond_to? :to_ary
-            hash[k] = v.to_ary.join("\n")
-          else
-            hash[k] = v
-          end
-          hash
-        end
-      end
-      def [](k)
-        super @names[k.downcase]
-      end
-      def []=(k, v)
-        delete k
-        @names[k.downcase] = k
-        super k, v
-      end
-      def delete(k)
-        super @names.delete(k.downcase)
-      end
-      def include?(k)
-        @names.has_key? k.downcase
-      end
-      alias_method :has_key?, :include?
-      alias_method :member?, :include?
-      alias_method :key?, :include?
-      def merge!(other)
-        other.each { |k, v| self[k] = v }
-        self
-      end
-      def merge(other)
-        hash = dup
-        hash.merge! other
-      end
-    end
-    # Every standard HTTP code mapped to the appropriate message.
-    # Stolen from Mongrel.
-    HTTP_STATUS_CODES = {
-      100  => 'Continue',
-      101  => 'Switching Protocols',
-      200  => 'OK',
-      201  => 'Created',
-      202  => 'Accepted',
-      203  => 'Non-Authoritative Information',
-      204  => 'No Content',
-      205  => 'Reset Content',
-      206  => 'Partial Content',
-      300  => 'Multiple Choices',
-      301  => 'Moved Permanently',
-      302  => 'Found',
-      303  => 'See Other',
-      304  => 'Not Modified',
-      305  => 'Use Proxy',
-      307  => 'Temporary Redirect',
-      400  => 'Bad Request',
-      401  => 'Unauthorized',
-      402  => 'Payment Required',
-      403  => 'Forbidden',
-      404  => 'Not Found',
-      405  => 'Method Not Allowed',
-      406  => 'Not Acceptable',
-      407  => 'Proxy Authentication Required',
-      408  => 'Request Timeout',
-      409  => 'Conflict',
-      410  => 'Gone',
-      411  => 'Length Required',
-      412  => 'Precondition Failed',
-      413  => 'Request Entity Too Large',
-      414  => 'Request-URI Too Large',
-      415  => 'Unsupported Media Type',
-      416  => 'Requested Range Not Satisfiable',
-      417  => 'Expectation Failed',
-      500  => 'Internal Server Error',
-      501  => 'Not Implemented',
-      502  => 'Bad Gateway',
-      503  => 'Service Unavailable',
-      504  => 'Gateway Timeout',
-      505  => 'HTTP Version Not Supported'
-    }
-    # Responses with HTTP status codes that should not have an entity body
-    STATUS_WITH_NO_ENTITY_BODY = Set.new((100..199).to_a << 204 << 304)
-    # A multipart form data parser, adapted from IOWA.
-    #
-    # Usually, Rack::Request#POST takes care of calling this.
-    module Multipart
-      EOL = "\r\n"
-      def self.parse_multipart(env)
-        unless env['CONTENT_TYPE'] =~
-            %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
-          nil
-        else
-          boundary = "--#{$1}"
-          params = {}
-          buf = ""
-          content_length = env['CONTENT_LENGTH'].to_i
-          input = env['rack.input']
-          boundary_size = boundary.size + EOL.size
-          bufsize = 16384
-          content_length -= boundary_size
-          status = input.read(boundary_size)
-          raise EOFError, "bad content body"  unless status == boundary + EOL
-          rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/n
-          loop {
-            head = nil
-            body = ''
-            filename = content_type = name = nil
-            until head && buf =~ rx
-              if !head && i = buf.index("\r\n\r\n")
-                head = buf.slice!(0, i+2) # First \r\n
-                buf.slice!(0, 2)          # Second \r\n
-                filename = head[/Content-Disposition:.* filename="?([^\";]*)"?/ni, 1]
-                content_type = head[/Content-Type: (.*)\r\n/ni, 1]
-                name = head[/Content-Disposition:.* name="?([^\";]*)"?/ni, 1]
-                if filename
-                  body = Tempfile.new("RackMultipart")
-                  body.binmode  if body.respond_to?(:binmode)
-                end
-                next
-              end
-              # Save the read body part.
-              if head && (boundary_size+4 < buf.size)
-                body << buf.slice!(0, buf.size - (boundary_size+4))
-              end
-              c = input.read(bufsize < content_length ? bufsize : content_length)
-              raise EOFError, "bad content body"  if c.nil? || c.empty?
-              buf << c
-              content_length -= c.size
-            end
-            # Save the rest.
-            if i = buf.index(rx)
-              body << buf.slice!(0, i)
-              buf.slice!(0, boundary_size+2)
-              content_length = -1  if $1 == "--"
-            end
-            if filename == ""
-              # filename is blank which means no file has been selected
-              data = nil
-            elsif filename
-              body.rewind
-              # Take the basename of the upload's original filename.
-              # This handles the full Windows paths given by Internet Explorer
-              # (and perhaps other broken user agents) without affecting
-              # those which give the lone filename.
-              filename =~ /^(?:.*[:\\\/])?(.*)/m
-              filename = $1
-              data = {:filename => filename, :type => content_type,
-                      :name => name, :tempfile => body, :head => head}
-            else
-              data = body
-            end
-            Utils.normalize_params(params, name, data) unless data.nil?
-            break  if buf.empty? || content_length == -1
-          }
-          begin
-            input.rewind if input.respond_to?(:rewind)
-          rescue Errno::ESPIPE
-            # Handles exceptions raised by input streams that cannot be rewound
-            # such as when using plain CGI under Apache
-          end
-          params
-        end
-      end
-    end
-  end
-end