bump RAILS_VERSION to github38

RAILS_VERSION

@@ -1 +1 @@
-2.3.14.github39
+2.3.14.github38

actionpack/lib/action_controller/benchmarking.rb

@@ -87,6 +87,7 @@ module ActionController #:nodoc:
           log_message << " [#{complete_request_uri rescue "unknown"}]"
 
           logger.info(log_message)
+          response.headers["X-Runtime"] = "%.0f" % ms
         else
           perform_action_without_benchmark
         end

actionpack/lib/action_controller/session/cookie_store.rb

@@ -37,7 +37,7 @@ module ActionController
     # Note that changing digest or secret invalidates all existing sessions!
     class CookieStore
       include AbstractStore::SessionUtils
-
+      
       # Cookies can typically store 4096 bytes.
       MAX = 4096
       SECRET_MIN_LENGTH = 30 # characters
@@ -95,21 +95,14 @@ module ActionController
 
       def call(env)
         prepare!(env)
-
+        
         status, headers, body = @app.call(env)
 
         session_data = env[ENV_SESSION_KEY]
         options = env[ENV_SESSION_OPTIONS_KEY]
         request = ActionController::Request.new(env)
-
+        
         if !(options[:secure] && !request.ssl?) && (!session_data.is_a?(AbstractStore::SessionHash) || session_data.loaded? || options[:expire_after])
-
-          # Backport standard Rack::Session::Cookie behavior
-          # Skip writing session if env['rack.session.options'][:skip] is set
-          if options[:skip]
-            return [status, headers, body]
-          end
-
           session_data.send(:load!) if session_data.is_a?(AbstractStore::SessionHash) && !session_data.loaded?
 
           persistent_session_id!(session_data)
@@ -129,7 +122,7 @@ module ActionController
       end
 
       private
-
+      
         def prepare!(env)
           env[ENV_SESSION_KEY] = AbstractStore::SessionHash.new(self, env)
           env[ENV_SESSION_OPTIONS_KEY] = AbstractStore::OptionsHash.new(self, env, @default_options)
@@ -140,7 +133,7 @@ module ActionController
           data = persistent_session_id!(data)
           [data[:session_id], data]
         end
-
+        
         def extract_session_id(env)
           if data = unpacked_cookie_data(env)
             persistent_session_id!(data) unless data.empty?