Fix issues with bogus % encoded sequences in URLs

[rails.git] / config / initializers / streaming.rb

diff --git a/config/initializers/streaming.rb b/config/initializers/streaming.rb
index db61e6b24041069f478d5ef09a5b5f2076155ab3..3db2a55f9a1fa7cfeb1ec6d6f70fa6c1710f9953 100644 (file)
--- a/config/initializers/streaming.rb
+++ b/config/initializers/streaming.rb
@@ -4,7 +4,7 @@ module ActionController
     alias_method :old_send_file, :send_file
 
     def send_file(file, options = {})
-      if file.is_a? File or file.is_a? Tempfile
+      if file.is_a?(File) || file.is_a?(Tempfile)
         headers["Content-Length"] ||= file.size.to_s
 
         options[:filename] ||= File.basename(file.path) unless options[:url_based_filename]