1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index adb3e94134..b9bd49f670 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -38,9 +38,13 @@ module ActionController #:nodoc:
     def _process_options(options) #:nodoc:
       super
       if options[:stream]
-        headers["Cache-Control"] ||= "no-cache"
-        headers["Transfer-Encoding"] = "chunked"
-        headers.delete("Content-Length")
+        if env["HTTP_VERSION"] == "HTTP/1.0"
+          options.delete(:stream)
+        else
+          headers["Cache-Control"] ||= "no-cache"
+          headers["Transfer-Encoding"] = "chunked"
+          headers.delete("Content-Length")
+        end
       end
     end