From 916f9e5143a07092afe1efdf22b8928241c6781c Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 10 Feb 2007 02:44:32 +0000 Subject: [PATCH] Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6143 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ .../cgi_ext/session_performance_fix.rb | 30 +++++++++++++++++++ .../lib/action_controller/cgi_process.rb | 1 + 3 files changed, 33 insertions(+) create mode 100644 actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 5b2a50f05c..0091b6d79b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id. [Stefan Kaes] + * Add a :url_based_filename => true option to ActionController::Streaming::send_file, which allows URL-based filenames. [Thomas Fuchs] * Fix that FormTagHelper#submit_tag using :disable_with should trigger the onsubmit handler of its form if available [DHH] diff --git a/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb b/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb new file mode 100644 index 0000000000..7305167860 --- /dev/null +++ b/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb @@ -0,0 +1,30 @@ +# CGI::Session#create_new_id requires 'digest/md5' on every call. This makes +# sense when spawning processes per request, but is unnecessarily expensive +# when serving requests from a long-lived process. +# +# http://railsexpress.de/blog/articles/2005/11/22/speeding-up-the-creation-of-new-sessions +require 'cgi/session' +require 'digest/md5' + +class CGI + class Session #:nodoc: + private + # Create a new session id. + # + # The session id is an MD5 hash based upon the time, + # a random number, and a constant string. This routine + # is used internally for automatically generated + # session ids. + def create_new_id + md5 = Digest::MD5::new + now = Time::now + md5.update(now.to_s) + md5.update(String(now.usec)) + md5.update(String(rand(0))) + md5.update(String($$)) + md5.update('foobar') + @new_session = true + md5.hexdigest + end + end +end diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 8d24f8dd94..2af1654eec 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -1,6 +1,7 @@ require 'action_controller/cgi_ext/cgi_ext' require 'action_controller/cgi_ext/cookie_performance_fix' require 'action_controller/cgi_ext/raw_post_data_fix' +require 'action_controller/cgi_ext/session_performance_fix' module ActionController #:nodoc: class Base -- GitLab