From f8542a64b30bb6f67bcedf0c82de1291aab3c3d9 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Mon, 30 May 2005 09:00:46 +0000 Subject: Make sure the benchmarking render method always returns the result of the render, regardless of whether logging is enabled or not. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1371 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/cgi_ext') diff --git a/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb b/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb index 11b36e0dd4..5cb13c2456 100644 --- a/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb +++ b/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb @@ -18,7 +18,9 @@ class CGI #:nodoc: end private - MULTIPART_FORM_BOUNDARY_RE = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n #" + unless defined?(MULTIPART_FORM_BOUNDARY_RE) + MULTIPART_FORM_BOUNDARY_RE = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n #" + end def multipart_form_boundary if env_table['REQUEST_METHOD'] == 'POST' -- cgit v1.2.3