Merge remote branch 'rails/master'

3 files changed, 18 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 64f4d1d532..ad98249468 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -24,9 +24,9 @@ module ActionDispatch
 
         def [](key)
           if key == :id
-            load_session_id! unless super(:id) || has_session_id?
+            load_session_id! unless key?(:id) || has_session_id?
           end
-          super(key)
+          super
         end
 
       private
@@ -191,8 +191,11 @@ module ActionDispatch
 
         def load_session(env)
           stale_session_check! do
-            sid = current_session_id(env)
-            sid, session = get_session(env, sid)
+            if sid = current_session_id(env)
+              sid, session = get_session(env, sid)
+            else
+              sid, session = generate_sid, {}
+            end
             [sid, session]
           end
         end
diff --git a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
index 28e3dbd732..5304440418 100644
--- a/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb
@@ -25,7 +25,6 @@ module ActionDispatch
 
       private
         def get_session(env, sid)
-          sid ||= generate_sid
           begin
             session = @pool.get(sid) || {}
           rescue MemCache::MemCacheError, Errno::ECONNREFUSED
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 4618f3befc..41078eced7 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -46,7 +46,7 @@ module ActionDispatch
     end
 
     def insert(index, *args, &block)
-      index = self.index(index) unless index.is_a?(Integer)
+      index = assert_index(index, :before)
       middleware = self.class::Middleware.new(*args, &block)
       super(index, middleware)
     end
@@ -54,9 +54,8 @@ module ActionDispatch
     alias_method :insert_before, :insert
 
     def insert_after(index, *args, &block)
-      i = index.is_a?(Integer) ? index : self.index(index)
-      raise "No such middleware to insert after: #{index.inspect}" unless i
-      insert(i + 1, *args, &block)
+      index = assert_index(index, :after)
+      insert(index + 1, *args, &block)
     end
 
     def swap(target, *args, &block)
@@ -79,5 +78,13 @@ module ActionDispatch
       raise "MiddlewareStack#build requires an app" unless app
       reverse.inject(app) { |a, e| e.build(a) }
     end
+
+  protected
+
+    def assert_index(index, where)
+      i = index.is_a?(Integer) ? index : self.index(index)
+      raise "No such middleware to insert #{where}: #{index.inspect}" unless i
+      i
+    end
   end
 end