use of triggerUserOutboundEvent to reset requestSize.

Kitura · Aug 30, 2019 · cf7232d · cf7232d
1 parent 2613958
commit cf7232d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/Sources/KituraNet/HTTP/HTTPRequestHandler.swift b/Sources/KituraNet/HTTP/HTTPRequestHandler.swift
@@ -99,6 +99,7 @@ internal class HTTPRequestHandler: ChannelInboundHandler, RemovableChannelHandle
                 serverRequest.buffer!.byteBuffer.writeBuffer(&buffer)
             }
         case .end:
+            let resetRequestSize = 0
             serverResponse = HTTPServerResponse(channel: context.channel, handler: self)
             //Make sure we use the latest delegate registered with the server
             DispatchQueue.global().async {
@@ -107,14 +108,12 @@ internal class HTTPRequestHandler: ChannelInboundHandler, RemovableChannelHandle
                 Monitor.delegate?.started(request: serverRequest, response: serverResponse)
                 delegate.handle(request: serverRequest, response: serverResponse)
             }
+            self.userInboundEventTriggered(context: context, event: resetRequestSize)
         }
     }
 
-    //IdleStateEvents are received on this method
     public func userInboundEventTriggered(context: ChannelHandlerContext, event: Any) {
-        if event is IdleStateHandler.IdleStateEvent {
-            _ = context.close()
-        }
+        context.triggerUserOutboundEvent(event, promise: nil)
     }
 
     public func channelReadComplete(context: ChannelHandlerContext) {

diff --git a/Sources/KituraNet/HTTP/HTTPServer.swift b/Sources/KituraNet/HTTP/HTTPServer.swift
@@ -324,11 +324,11 @@ public class HTTPServer: Server {
                 })
                 return channel.pipeline.configureHTTPServerPipeline(withServerUpgrade: config, withErrorHandling: true).flatMap {
                     if let nioSSLServerHandler = self.createNIOSSLServerHandler() {
-                        _ = channel.pipeline.addHandler(nioSSLServerHandler, position: .first)
+                        return channel.pipeline.addHandler(nioSSLServerHandler, position: .first)
                     }
-                    _ = channel.pipeline.addHandler(serverConfigurationHandler, position: .first)
-                    return channel.pipeline.addHandler(httpHandler)
-                }
+                    return channel.eventLoop.makeSucceededFuture(()) } .flatMap {
+                        return channel.pipeline.addHandler(serverConfigurationHandler, position: .first) }.flatMap {
+                            return channel.pipeline.addHandler(httpHandler)}
             }
 
         let listenerDescription: String

diff --git a/Sources/KituraNet/HTTP/HTTPServerConfigurationHandler.swift b/Sources/KituraNet/HTTP/HTTPServerConfigurationHandler.swift
@@ -46,11 +46,9 @@ internal class HTTPServerConfigurationHandler: ChannelDuplexHandler {
         context.fireChannelRead(wrapInboundOut(data))
     }
 
-    public func channelReadComplete(context: ChannelHandlerContext){
-        requestSize = 0
-        context.fireChannelReadComplete()
+    public func triggerUserOutboundEvent(context: ChannelHandlerContext, event: Any, promise: EventLoopPromise<Void>?) {
+        requestSize = event as? Int ?? 0
     }
-
     public func channelActive(context: ChannelHandlerContext) {
         _ = server.connectionCount.add(1)
         if let connectionLimit1 = connectionLimit {