Merge pull request #9272 from gtirloni/9271-http416

Fix gzip cache corruption when recovering from HTTP 416 responses

(cherry picked from commit 999afe3)

Author: hsbt

bundler/lib/bundler/fetcher/downloader.rb

@@ -54,7 +54,6 @@ def fetch(uri, headers = {}, counter = 0)
         when Gem::Net::HTTPRequestedRangeNotSatisfiable
           new_headers = headers.dup
           new_headers.delete("Range")
-          new_headers["Accept-Encoding"] = "gzip"
           fetch(uri, new_headers)
         when Gem::Net::HTTPRequestEntityTooLarge
           raise FallbackError, response.body

bundler/spec/bundler/fetcher/downloader_spec.rb

@@ -126,6 +126,38 @@
       end
     end
 
+    context "when the request response is a Gem::Net::HTTPRequestedRangeNotSatisfiable" do
+      let(:http_response) { Gem::Net::HTTPRequestedRangeNotSatisfiable.new("1.1", 416, "Range Not Satisfiable") }
+      let(:success_response) { Gem::Net::HTTPSuccess.new("1.1", 200, "Success") }
+      let(:options) { { "Range" => "bytes=1000-", "If-None-Match" => "some-etag" } }
+
+      before do
+        # First request returns 416, retry request returns success
+        allow(subject).to receive(:request).with(uri, options).and_return(http_response)
+        allow(subject).to receive(:request).with(uri, { "If-None-Match" => "some-etag" }).and_return(success_response)
+      end
+
+      # The 416 handler removes the Range header and retries without incrementing the counter.
+      # Importantly, it does NOT add Accept-Encoding header, which would break Ruby's
+      # automatic gzip decompression (see issue #9271 for details on that bug).
+      it "should retry the request without the Range header" do
+        expect(subject).to receive(:request).with(uri, options).ordered
+        expect(subject).to receive(:request).with(uri, hash_excluding("Range", "Accept-Encoding")).ordered
+        subject.fetch(uri, options, counter)
+      end
+
+      it "should preserve other headers on retry" do
+        expect(subject).to receive(:request).with(uri, options).ordered
+        expect(subject).to receive(:request).with(uri, hash_including("If-None-Match" => "some-etag")).ordered
+        subject.fetch(uri, options, counter)
+      end
+
+      it "should return the successful response" do
+        result = subject.fetch(uri, options, counter)
+        expect(result).to eq(success_response)
+      end
+    end
+
     context "when the request response is some other type" do
       let(:http_response) { Gem::Net::HTTPBadGateway.new("1.1", 500, "Fatal Error") }