aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG9
-rw-r--r--actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb2
2 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index b38df11a2a..ebfac7ee0a 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,10 +1,11 @@
*SVN*
-* Added Effect.Squish for scaling down an element and making it disappear at the end #972 [thomas@fesch.at]
+* Fixed that on very rare occasions, webrick would raise a NoMethodError: private method 'split' called for nil #1001 [Flurin Egger]
-* Added Effect.Scale for smoothly scaling images or text up and down #972 [thomas@fesch.at]
-
-* Added Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 [thomas@fesch.at]
+* Added a wide range of new Javascript effects:
+ * Effect.Squish for scaling down an element and making it disappear at the end #972 [thomas@fesch.at]
+ * Effect.Scale for smoothly scaling images or text up and down #972 [thomas@fesch.at]
+ * Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 [thomas@fesch.at]
* Fixed problem with page caching #958 [Rick Olson]
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 d5ff103b45..5be4b57c66 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
@@ -37,7 +37,7 @@ class CGI #:nodoc:
when 'POST'
stdinput.binmode if stdinput.respond_to?(:binmode)
content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) || ''
- env_table['RAW_POST_DATA'] = content.split("&_").first.freeze # &_ is a fix for Safari Ajax postings that always append \000
+ env_table['RAW_POST_DATA'] = content.split("&_").first.to_s.freeze # &_ is a fix for Safari Ajax postings that always append \000
else
read_from_cmdline
end