Skip HTTPResponseCompressor logic if response is 204 (no content) (#105)

* Skip HTTPResponseCompressor logic if response is 204 (no content) * update test manifests * use mayHaveResponseBody
apple · Aug 14, 2020 · 0b9eb87 · 0b9eb87
1 parent f700f5b
commit 0b9eb87
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/Sources/NIOHTTPCompression/HTTPResponseCompressor.swift b/Sources/NIOHTTPCompression/HTTPResponseCompressor.swift
@@ -106,7 +106,7 @@ public final class HTTPResponseCompressor: ChannelDuplexHandler, RemovableChanne
         let httpData = unwrapOutboundIn(data)
         switch httpData {
         case .head(var responseHead):
-            guard let algorithm = compressionAlgorithm() else {
+            guard let algorithm = compressionAlgorithm(), responseHead.status.mayHaveResponseBody else {
                 context.write(wrapOutboundOut(.head(responseHead)), promise: promise)
                 return
             }

diff --git a/Tests/NIOHTTPCompressionTests/HTTPResponseCompressorTest+XCTest.swift b/Tests/NIOHTTPCompressionTests/HTTPResponseCompressorTest+XCTest.swift
@@ -52,6 +52,7 @@ extension HTTPResponseCompressorTest {
                 ("testStartsWithSameUnicodeScalarsSaysNoForTheSameStringInDifferentNormalisations", testStartsWithSameUnicodeScalarsSaysNoForTheSameStringInDifferentNormalisations),
                 ("testStartsWithSaysYesForTheSameStringInDifferentNormalisations", testStartsWithSaysYesForTheSameStringInDifferentNormalisations),
                 ("testCanBeRemoved", testCanBeRemoved),
+                ("testBypassCompressionWhenNoContent", testBypassCompressionWhenNoContent),
            ]
    }
 }

diff --git a/Tests/NIOHTTPCompressionTests/HTTPResponseCompressorTest.swift b/Tests/NIOHTTPCompressionTests/HTTPResponseCompressorTest.swift
@@ -633,6 +633,32 @@ class HTTPResponseCompressorTest: XCTestCase {
         try sendRequest(acceptEncoding: "deflate", channel: channel)
         try assertUncompressedResponse(channel: channel)
     }
+
+    func testBypassCompressionWhenNoContent() throws {
+        let channel = EmbeddedChannel()
+        XCTAssertNoThrow(try channel.pipeline.addHandler(HTTPResponseCompressor()).wait())
+        defer {
+            XCTAssertNoThrow(try channel.finish())
+        }
+
+        try sendRequest(acceptEncoding: "deflate;q=2.2, gzip;q=0.3", channel: channel)
+
+        let head = HTTPResponseHead(version: .init(major: 1, minor: 1),
+                                    status: .noContent,
+                                    headers: .init())
+        try channel.writeOutbound(HTTPServerResponsePart.head(head))
+        try channel.writeOutbound(HTTPServerResponsePart.end(nil))
+
+        while let part = try channel.readOutbound(as: HTTPServerResponsePart.self) {
+            switch part {
+            case .head(let head):
+                XCTAssertEqual(head.headers[canonicalForm: "content-encoding"], [])
+            case .body:
+                XCTFail("Unexpected body")
+            case .end: break
+            }
+        }
+    }
 }
 
 extension EventLoopFuture {