Ruby 1.9 compat: work around that String is not Enumerable

2 files changed, 6 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index 163ba84a3e..fd3c30a92f 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -326,7 +326,11 @@ module ActionController
           end
 
           @body = ""
-          body.each { |part| @body << part }
+          if body.is_a?(String)
+            @body << body
+          else
+            body.each { |part| @body << part }
+          end
 
           if @controller = ActionController::Base.last_instantiation
             @request = @controller.request
diff --git a/actionpack/lib/action_controller/url_encoded_pair_parser.rb b/actionpack/lib/action_controller/url_encoded_pair_parser.rb
index 57594c4259..b17b8a31aa 100644
--- a/actionpack/lib/action_controller/url_encoded_pair_parser.rb
+++ b/actionpack/lib/action_controller/url_encoded_pair_parser.rb
@@ -46,7 +46,7 @@ module ActionController
           when Array
             value.map { |v| get_typed_value(v) }
           when Hash
-            if value.has_key?(:tempfile) && value[:filename].any?
+            if value.has_key?(:tempfile) && !value[:filename].blank?
               upload = value[:tempfile]
               upload.extend(UploadedFile)
               upload.original_path = value[:filename]