From 5609149d844ece5020dd53565d35cf69f563a8da Mon Sep 17 00:00:00 2001 From: Rizwan Reza Date: Fri, 11 Jun 2010 12:12:53 +0430 Subject: [PATCH] Moved Domain regexp to a constant and added comments. --- .../action_dispatch/middleware/session/abstract_store.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index 0c4ceb5c39388..b03244d025ad0 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -93,6 +93,13 @@ def stale_session_check! :cookie_only => true } + # This regular expression is used to split the levels of a domain: + # So www.example.co.uk gives: + # $1 => www. + # $2 => example + # $3 => co.uk + DOMAIN_REGEXP = /^(.*\.)*(.*)\.(...|...\...|....|..\...|..)$/ + def initialize(app, options = {}) @app = app @default_options = DEFAULT_OPTIONS.merge(options) @@ -123,7 +130,7 @@ def call(env) end if options[:domain] == :all - env["HTTP_HOST"] =~ /^(.*\.)*(.*)\.(...|...\...|....|..\...)$/ + env["HTTP_HOST"] =~ DOMAIN_REGEXP options[:domain] = ".#{$2}.#{$3}" end