2 files changed, 15 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
 
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index b8df5ec4e8..fed8d40b47 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -83,6 +83,14 @@ module RenderStreaming
       assert_streaming!
     end
 
+    test "do not stream on HTTP/1.0" do
+      get "/render_streaming/basic/hello_world", nil, "HTTP_VERSION" => "HTTP/1.0"
+      assert_body "Hello world, I'm here!"
+      assert_status 200
+      assert_equal "22", headers["Content-Length"]
+      assert_equal nil, headers["Transfer-Encoding"]
+    end
+
     def assert_streaming!(cache="no-cache")
       assert_status 200
       assert_equal nil, headers["Content-Length"]