lib/action_controller/session/cookie_store.rb in actionpack-2.1.2 vs lib/action_controller/session/cookie_store.rb in actionpack-2.2.2

@@ -68,11 +68,12 @@
     @cookie_options = {
       'name'    => options['session_key'],
       'path'    => options['session_path'],
       'domain'  => options['session_domain'],
       'expires' => options['session_expires'],
-      'secure'  => options['session_secure']
+      'secure'  => options['session_secure'],
+      'http_only' => options['session_http_only']
     }
 
     # Set no_hidden and no_cookies since the session id is unused and we
     # set our own data cookie.
     options['no_hidden'] = true
@@ -127,10 +128,10 @@
   end
 
   private
     # Marshal a session hash into safe cookie data. Include an integrity hash.
     def marshal(session)
-      data = ActiveSupport::Base64.encode64(Marshal.dump(session)).chop
+      data = ActiveSupport::Base64.encode64s(Marshal.dump(session))
       "#{data}--#{generate_digest(data)}"
     end
 
     # Unmarshal cookie data to a hash and verify its integrity.
     def unmarshal(cookie)