Changeset 339

Timestamp:

07/19/07 22:43:58 (1 year ago)

Author:

v..@exdolo.com

Message:

@_params.symbolize_keys! must take place before @_params[_session_id_key] is referred to, since _session_id_key returns a symbol by default. This fixes a bug where session id could not be recognized when passed as part of the query string, even when session_id_cookie_only and query_string_whitelist were set properly in merb.yml

Files:

• trunk/lib/merb/merb_controller.rb (modified) (2 diffs)

trunk/lib/merb/merb_controller.rb

@@ -64 +64 @@
-      end
-      
-
+
+
-      if @_params.key?(_session_id_key) && !Merb::Server.config[:session_id_cookie_only]
-        @_cookies[_session_id_key] = @_params[_session_id_key]
@@ -74 +75 @@
-        @_cookies[_session_id_key] = @_params[_session_id_key] if Merb::Server.config[:query_string_whitelist].include?("#{params[:controller]}/#{params[:action]}")
-      end  
-      
-      @_cookies.symbolize_keys!
-      @_params.symbolize_keys!
-      
-      # Handle alternate HTTP method passed as _method parameter.