diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-05-13 20:29:43 +0100 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-05-13 20:34:49 +0100 |
| commit | 8ce6b0c8493f4d88bba67fa5661fd2f4f1f6f032 (patch) | |
| tree | 52bf384c06e37fc19c4914f03fa7f5f4d7b42c46 /actionpack/lib/action_dispatch | |
| parent | 2b6f566f9e7c191c73c0f188bd1a5b3e44485508 (diff) | |
| download | rails-8ce6b0c8493f4d88bba67fa5661fd2f4f1f6f032.tar.gz rails-8ce6b0c8493f4d88bba67fa5661fd2f4f1f6f032.tar.bz2 rails-8ce6b0c8493f4d88bba67fa5661fd2f4f1f6f032.zip | |
Autoload ActionDispatch::Request::Session to avoid circular require.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 9748956052..56908b5794 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -6,7 +6,6 @@ require 'active_support/core_ext/hash/indifferent_access' require 'active_support/core_ext/string/access' require 'active_support/inflector' require 'action_dispatch/http/headers' -require 'action_dispatch/request/session' require 'action_controller/metal/exceptions' module ActionDispatch @@ -18,6 +17,8 @@ module ActionDispatch include ActionDispatch::Http::Upload include ActionDispatch::Http::URL + autoload :Session, 'action_dispatch/request/session' + LOCALHOST = Regexp.union [/^127\.0\.0\.\d{1,3}$/, /^::1$/, /^0:0:0:0:0:0:0:1(%.*)?$/] ENV_METHODS = %w[ AUTH_TYPE GATEWAY_INTERFACE |