Permalink
Browse files

Merge [5442] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5443 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 5887b18 commit 5f5d8c224b44017040bcf75dcbb1e80028bd62e0 @jeremy jeremy committed Nov 6, 2006
Showing with 10 additions and 7 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +8 −7 actionpack/lib/action_controller/cgi_process.rb
@@ -1,5 +1,7 @@
*SVN*
+* Cache parsed query parameters. #6559 [Stefan Kaes]
+
* Deprecate JavaScriptHelper#update_element_function, which is superseeded by RJS [Thomas Fuchs]
* Fix invalid test fixture exposed by stricter Ruby 1.8.5 multipart parsing. #6524 [Bob Silva]
@@ -8,24 +8,24 @@ class Base
# sessions (large performance increase if sessions are not needed). The <tt>session_options</tt> are the same as for CGI::Session:
#
# * <tt>:database_manager</tt> - standard options are CGI::Session::FileStore, CGI::Session::MemoryStore, and CGI::Session::PStore
- # (default). Additionally, there is CGI::Session::DRbStore and CGI::Session::ActiveRecordStore. Read more about these in
+ # (default). Additionally, there is CGI::Session::DRbStore and CGI::Session::ActiveRecordStore. Read more about these in
# lib/action_controller/session.
# * <tt>:session_key</tt> - the parameter name used for the session id. Defaults to '_session_id'.
# * <tt>:session_id</tt> - the session id to use. If not provided, then it is retrieved from the +session_key+ parameter
# of the request, or automatically generated for a new session.
# * <tt>:new_session</tt> - if true, force creation of a new session. If not set, a new session is only created if none currently
- # exists. If false, a new session is never created, and if none currently exists and the +session_id+ option is not set,
+ # exists. If false, a new session is never created, and if none currently exists and the +session_id+ option is not set,
# an ArgumentError is raised.
# * <tt>:session_expires</tt> - the time the current session expires, as a +Time+ object. If not set, the session will continue
# indefinitely.
# * <tt>:session_domain</tt> - the hostname domain for which this session is valid. If not set, defaults to the hostname of the
# server.
# * <tt>:session_secure</tt> - if +true+, this session will only work over HTTPS.
# * <tt>:session_path</tt> - the path for which this session applies. Defaults to the directory of the CGI script.
- def self.process_cgi(cgi = CGI.new, session_options = {})
+ def self.process_cgi(cgi = CGI.new, session_options = {})
new.process_cgi(cgi, session_options)
end
-
+
def process_cgi(cgi, session_options = {}) #:nodoc:
process(CgiRequest.new(cgi, session_options), CgiResponse.new(cgi)).out
end
@@ -51,7 +51,7 @@ def query_string
if (qs = @cgi.query_string) && !qs.empty?
qs
elsif uri = @env['REQUEST_URI']
- parts = uri.split('?')
+ parts = uri.split('?')
parts.shift
parts.join('?')
else
@@ -60,7 +60,8 @@ def query_string
end
def query_parameters
- (qs = self.query_string).empty? ? {} : CGIMethods.parse_query_parameters(qs)
+ @query_parameters ||=
+ (qs = self.query_string).empty? ? {} : CGIMethods.parse_query_parameters(qs)
end
def request_parameters
@@ -71,7 +72,7 @@ def request_parameters
CGIMethods.parse_request_parameters(@cgi.params)
end
end
-
+
def cookies
@cgi.cookies.freeze
end

0 comments on commit 5f5d8c2

Please sign in to comment.