Kill request instance memoization

Conflicts:

	test/spec_rack_mock.rb

3 files changed, 1 insertions, 25 deletions

diff --git a/lib/rack/request.rb b/lib/rack/request.rb
index 0bff7af0..be534a85 100644
--- a/lib/rack/request.rb
+++ b/lib/rack/request.rb
@@ -17,14 +17,6 @@ module Rack
     # The environment of the request.
     attr_reader :env
 
-    def self.new(env, *args)
-      if self == Rack::Request
-        env["rack.request"] ||= super
-      else
-        super
-      end
-    end
-
     def initialize(env)
       @env = env
     end
diff --git a/test/spec_rack_mock.rb b/test/spec_rack_mock.rb
index b16306b1..9c392a28 100644
--- a/test/spec_rack_mock.rb
+++ b/test/spec_rack_mock.rb
@@ -130,7 +130,7 @@ context "Rack::MockResponse" do
     res.original_headers["Content-Type"].should.equal "text/yaml"
     res["Content-Type"].should.equal "text/yaml"
     res.content_type.should.equal "text/yaml"
-    res.content_length.should.be 464  # needs change often.
+    res.content_length.should.be 401  # needs change often.
     res.location.should.be.nil
   end
 
diff --git a/test/spec_rack_request.rb b/test/spec_rack_request.rb
index dbfd5b17..7e4be775 100644
--- a/test/spec_rack_request.rb
+++ b/test/spec_rack_request.rb
@@ -467,22 +467,6 @@ EOF
     res.body.should.equal '212.212.212.212'
   end
 
-  specify "memoizes itself to reduce the cost of repetitive initialization" do
-    env = Rack::MockRequest.env_for("http://example.com:8080/")
-    env['rack.request'].should.be.nil
-
-    req1 = Rack::Request.new(env)
-    env['rack.request'].should.not.be.nil
-    req1.should.equal env['rack.request']
-
-    rack_request_object_id = env['rack.request'].object_id
-
-    req2 = Rack::Request.new(env)
-    env['rack.request'].should.not.be.nil
-    rack_request_object_id.should.be.equal env['rack.request'].object_id
-    req2.should.equal env['rack.request']
-  end
-
   class MyRequest < Rack::Request
     def params
       {:foo => "bar"}