upgrade to rails 2.3.12 and fix deprecation warning and fix some version numbers of gems used for testing

vendor/rails/actionpack/Rakefile

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -45,7 +45,7 @@ end
 
 # Genereate the RDoc documentation
 
-Rake::RDocTask.new { |rdoc|
+RDoc::Task.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Pack -- On rails from request to response"
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -76,14 +76,12 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionpack"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.3.11' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.12' + PKG_BUILD)
   s.add_dependency('rack', '~> 1.1.0')
 
   s.require_path = 'lib'
-  s.autorequire = 'action_controller'
 
   s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE" ]
   dist_dirs.each do |dir|
@@ -91,7 +89,7 @@ spec = Gem::Specification.new do |s|
   end
 end
   
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true

vendor/rails/actionpack/lib/action_controller/request.rb

@@ -446,7 +446,9 @@ EOM
     end
 
     def reset_session
-      session.destroy if session
+      # session may be a hash, if so, we do not want to call destroy
+      # fixes issue 6440
+      session.destroy if session and session.respond_to?(:destroy)
       self.session = {}
     end
 

vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb

@@ -196,6 +196,7 @@ module ActionController
 
           if (request_cookies.nil? || request_cookies[@key] != sid) || options[:expire_after]
             cookie = {:value => sid}
+            cookie[:expires] = Time.now + options[:expire_after] if options[:expire_after]
             Rack::Utils.set_cookie_header!(response[1], @key, cookie.merge(options))
           end
         end

vendor/rails/actionpack/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 11
+    TINY  = 12
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

vendor/rails/actionpack/test/controller/session/abstract_store_test.rb

@@ -0,0 +1,64 @@
+require 'abstract_unit'
+
+# You need to start a memcached server inorder to run these tests
+class AbstractStoreTest < ActionController::IntegrationTest
+  SessionKey = '_myapp_session'
+  DispatcherApp = ActionController::Dispatcher.new
+
+  class TestController < ActionController::Base
+    def get_session
+      session[:test] = 'test'
+      head :ok
+    end
+  end
+
+  def test_expiry_after
+    with_test_route_set(:expire_after => 5 * 60) do
+      get 'get_session'
+      assert_response :success
+      assert_match /expires=\S+/, headers['Set-Cookie']
+    end
+  end
+
+protected
+
+  def with_test_route_set(options = {})
+    with_routing do |set|
+      set.draw do |map|
+        map.with_options :controller => "abstract_store_test/test" do |c|
+          c.connect "/:action"
+        end
+      end
+
+      options = { :key => SessionKey, :secret => 'SessionSecret' }.merge!(options)
+      @integration_session = open_session(TestStore.new(DispatcherApp, options))
+
+      yield
+    end
+  end
+
+  class TestStore < ActionController::Session::AbstractStore
+    def initialize(app, options = {})
+      super
+      @_store = Hash.new({})
+    end
+
+  private
+
+    def get_session(env, sid)
+      sid ||= generate_sid
+      session = @_store[sid]
+      [sid, session]
+    end
+
+    def set_session(env, sid, session_data)
+      @_store[sid] = session_data
+    end
+
+    def destroy(env)
+      @_store.delete(sid)
+    end
+  end
+
+end
+

vendor/rails/actionpack/test/controller/session/cookie_store_test.rb

@@ -42,6 +42,12 @@ class CookieStoreTest < ActionController::IntegrationTest
       head :ok
     end
 
+    def call_reset_session_twice
+      reset_session
+      reset_session
+      head :ok
+    end
+
     def call_reset_session
       reset_session
       head :ok
@@ -190,6 +196,44 @@ class CookieStoreTest < ActionController::IntegrationTest
     end
   end
 
+  def test_calling_session_reset_twice
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      session_payload = response.body
+      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
+        headers['Set-Cookie']
+
+      get '/call_reset_session_twice'
+      assert_response :success
+      assert_not_equal "", headers['Set-Cookie']
+      assert_not_equal session_payload, cookies[SessionKey]
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+    end
+  end
+
+  def test_setting_session_value_after_session_reset
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      session_payload = response.body
+      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
+        headers['Set-Cookie']
+
+      get '/call_reset_session'
+      assert_response :success
+      assert_not_equal "", headers['Set-Cookie']
+      assert_not_equal session_payload, cookies[SessionKey]
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+    end
+  end
+
   def test_setting_session_value_after_session_reset
     with_test_route_set do
       get '/set_session_value'