diff options
| author | Konstantin Haase <konstantin.mailinglists@googlemail.com> | 2014-10-02 15:35:27 +0200 |
|---|---|---|
| committer | Konstantin Haase <konstantin.mailinglists@googlemail.com> | 2014-10-02 15:35:27 +0200 |
| commit | ab172af1b63f0d8e91ce579dd2907c43b96cf82a (patch) | |
| tree | 991037ede0df148b5aef7137f321591401f98d53 /lib/rack/mock.rb | |
| parent | a71be3c914c10d1089238f4e21b029b885be4029 (diff) | |
| parent | dc53a8c26dc55d21240233b3d83d36efdef6e924 (diff) | |
| download | rack-ab172af1b63f0d8e91ce579dd2907c43b96cf82a.tar.gz | |
Merge pull request #737 from schneems/schneems/less-objects
Less allocated objects on each request
Diffstat (limited to 'lib/rack/mock.rb')
| -rw-r--r-- | lib/rack/mock.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/rack/mock.rb b/lib/rack/mock.rb index 3c02c1fe..217ae0f7 100644 --- a/lib/rack/mock.rb +++ b/lib/rack/mock.rb @@ -91,15 +91,15 @@ module Rack env = DEFAULT_ENV.dup - env["REQUEST_METHOD"] = opts[:method] ? opts[:method].to_s.upcase : "GET" + env[REQUEST_METHOD] = opts[:method] ? opts[:method].to_s.upcase : "GET" env["SERVER_NAME"] = uri.host || "example.org" env["SERVER_PORT"] = uri.port ? uri.port.to_s : "80" - env["QUERY_STRING"] = uri.query.to_s - env["PATH_INFO"] = (!uri.path || uri.path.empty?) ? "/" : uri.path + env[QUERY_STRING] = uri.query.to_s + env[PATH_INFO] = (!uri.path || uri.path.empty?) ? "/" : uri.path env["rack.url_scheme"] = uri.scheme || "http" env["HTTPS"] = env["rack.url_scheme"] == "https" ? "on" : "off" - env["SCRIPT_NAME"] = opts[:script_name] || "" + env[SCRIPT_NAME] = opts[:script_name] || "" if opts[:fatal] env["rack.errors"] = FatalWarner.new @@ -108,10 +108,10 @@ module Rack end if params = opts[:params] - if env["REQUEST_METHOD"] == "GET" + if env[REQUEST_METHOD] == "GET" params = Utils.parse_nested_query(params) if params.is_a?(String) - params.update(Utils.parse_nested_query(env["QUERY_STRING"])) - env["QUERY_STRING"] = Utils.build_nested_query(params) + params.update(Utils.parse_nested_query(env[QUERY_STRING])) + env[QUERY_STRING] = Utils.build_nested_query(params) elsif !opts.has_key?(:input) opts["CONTENT_TYPE"] = "application/x-www-form-urlencoded" if params.is_a?(Hash) |