Use config.relative_url_root as the default path for session and autologin cookies...

Patch by Daniel Ritz.

git-svn-id: http://svn.redmine.org/redmine/trunk@14876 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 26121ce4a4f9d71b692935b373cce4a5785a7fad..3c318957b2d2e8e6a25a3b3637629fbf28fb2a2f 100644 (file)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -272,7 +272,7 @@ class AccountController < ApplicationController
     cookie_options = {
       :value => token.value,
       :expires => 1.year.from_now,
-      :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
+      :path => (Redmine::Configuration['autologin_cookie_path'] || RedmineApp::Application.config.relative_url_root || '/'),
       :secure => secure,
       :httponly => true
     }

diff --git a/config/application.rb b/config/application.rb
index d062d60184276ea0a20de9b392e7ee1ce7833556..96fa38b4986d51d44e19f4f827b3773a01922678 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -72,7 +72,9 @@ module RedmineApp
     # can change it (environments/ENV.rb would take precedence over it)
     config.log_level = Rails.env.production? ? :info : :debug
 
-    config.session_store :cookie_store, :key => '_redmine_session'
+    config.session_store :cookie_store,
+      :key => '_redmine_session',
+      :path => config.relative_url_root || '/'
 
     if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
       instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))