Closes requests with Connection: close header (swift-server#52)

* Closes requests with Connection: close header * Fixes whitespace and merge mistake

Author: Aaron Liberatore

Sources/HTTP/HTTPStreamingParser.swift

@@ -477,7 +477,7 @@ public class StreamingParser: HTTPResponseWriter {
  self.keepAliveUntil = Date(timeIntervalSinceNow: StreamingParser.keepAliveTimeout).timeIntervalSinceReferenceDate
  self.parserConnector?.responseComplete()
  } else {
- self.parserConnector?.closeWriter()
+ self.parserConnector?.responseCompleteCloseWriter()
  }
  completion(.ok)
  }
@@ -503,6 +503,9 @@ public protocol ParserConnecting: class {
 
  /// Let the network know that a response is complete, so it can be closed after timeout
  func responseComplete()
+ 
+ /// Let the network know that a response is complete and we're ready to close the connection
+ func responseCompleteCloseWriter()
 
  /// Used to let the network know we're ready to close the connection
  func closeWriter()

Sources/HTTP/PoCSocket/PoCSocketConnectionListener.swift

@@ -184,6 +184,14 @@ public class PoCSocketConnectionListener: ParserConnecting {
  }
  }
  }
+ 
+ /// Called by the parser to let us know that a response is complete and we should close the socket
+ public func responseCompleteCloseWriter() {
+ self.socketWriterQueue.async { [weak self] in
+ self?.responseCompleted = true
+ self?.close()
+ }
+ }
 
  /// Starts reading from the socket and feeding that data to the parser
  public func process() {

Tests/HTTPTests/ServerTests.swift

@@ -7,6 +7,7 @@
 //
 
 import XCTest
+import Dispatch
 
 @testable import HTTP
 
@@ -481,6 +482,45 @@ class ServerTests: XCTestCase {
  }
 
 
+ func testExplicitCloseConnections() {
+ let expectation = self.expectation(description: "0 Open Connection")
+ let server = HTTPServer()
+ do {
+ try server.start(port: 0, handler: OkHandler().handle)
+ 
+ let session = URLSession(configuration: URLSessionConfiguration.default)
+ let url1 = URL(string: "http://localhost:\(server.port)")!
+ var request = URLRequest(url: url1)
+ request.httpMethod = "POST"
+ request.setValue("close", forHTTPHeaderField: "Connection")
+ 
+ let dataTask1 = session.dataTask(with: request) { (responseBody, rawResponse, error) in
+ XCTAssertNil(error, "\(error!.localizedDescription)")
+ #if os(Linux)
+ XCTAssertEqual(server.connectionCount, 0)
+ expectation.fulfill()
+ 
+ // Darwin's URLSession replaces the `Connection: close` header with `Connection: keep-alive`, so allow it to expire
+ #else
+ DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
+ XCTAssertEqual(server.connectionCount, 0)
+ expectation.fulfill()
+ }
+ #endif
+ }
+ dataTask1.resume()
+ 
+ self.waitForExpectations(timeout: 30) { (error) in
+ if let error = error {
+ XCTFail("\(error)")
+ }
+ }
+ server.stop()
+ } catch {
+ XCTFail("Error listening on port \(0): \(error). Use server.failed(callback:) to handle")
+ }
+ }
+
  static var allTests = [
  ("testEcho", testEcho),
  ("testHello", testHello),
@@ -492,6 +532,7 @@ class ServerTests: XCTestCase {
  ("testRequestEchoEndToEnd", testRequestEchoEndToEnd),
  ("testRequestKeepAliveEchoEndToEnd", testRequestKeepAliveEchoEndToEnd),
  ("testRequestLargeEchoEndToEnd", testRequestLargeEchoEndToEnd),
+ ("testExplicitCloseConnections", testExplicitCloseConnections),
  ("testRequestLargePostHelloWorld", testRequestLargePostHelloWorld),
  ]
 }