Merge pull request #1 from Kitura/master

Update from upstream

Package.swift

@@ -1,7 +1,7 @@
 // swift-tools-version:5.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 /*
- * Copyright IBM Corporation 2016, 2017, 2018
+ * Copyright IBM Corporation and the Kitura project authors 2016-2020
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.8.0"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
         .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.0.0"),
-        .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", from: "1.0.0"),
-        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.3")
+        .package(url: "https://github.com/Kitura/BlueSSLService.git", from: "1.0.0"),
+        .package(url: "https://github.com/Kitura/LoggerAPI.git", from: "1.7.3")
     ],
     targets: [
         .target(

Sources/KituraNet/HTTP/HTTPRequestHandler.swift

@@ -200,7 +200,7 @@ internal class HTTPRequestHandler: ChannelInboundHandler, RemovableChannelHandle
         keepAliveState.decrement()
     }
 
-    func channelInactive(context: ChannelHandlerContext, httpServer: HTTPServer) {
-        httpServer.connectionCount.sub(1)
+    func channelInactive(context: ChannelHandlerContext) {
+        server.connectionCount.sub(1)
     }
 }