From a8d048de00e79a6a908f0c27e51426f4416ba313 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Wed, 26 May 2021 18:06:06 +0100
Subject: [PATCH] Remove pipelining support from the crossdomain handler

It isn't necessary.

Signed-off-by: Graham <gpe@openrs2.org>
---
 .../net/crossdomain/CrossDomainChannelHandler.kt  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/game/src/main/kotlin/org/openrs2/game/net/crossdomain/CrossDomainChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/crossdomain/CrossDomainChannelHandler.kt
index fa09f9ac..9dede9d0 100644
--- a/game/src/main/kotlin/org/openrs2/game/net/crossdomain/CrossDomainChannelHandler.kt
+++ b/game/src/main/kotlin/org/openrs2/game/net/crossdomain/CrossDomainChannelHandler.kt
@@ -4,6 +4,8 @@ import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelHandler
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.SimpleChannelInboundHandler
+import io.netty.handler.codec.http.HttpHeaderNames
+import io.netty.handler.codec.http.HttpHeaderValues
 import io.netty.handler.codec.http.HttpMethod
 import io.netty.handler.codec.http.HttpRequest
 import io.netty.handler.codec.http.HttpResponseStatus
@@ -28,6 +30,9 @@ public object CrossDomainChannelHandler : SimpleChannelInboundHandler<HttpReques
     }
 
     override fun channelRead0(ctx: ChannelHandlerContext, msg: HttpRequest) {
+        // forcibly close the connection as we only expect a single request
+        msg.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE)
+
         if (msg.method() != HttpMethod.GET || msg.uri() != ENDPOINT) {
             Http.writeResponse(ctx, msg, HttpResponseStatus.BAD_REQUEST)
             return
@@ -40,16 +45,6 @@ public object CrossDomainChannelHandler : SimpleChannelInboundHandler<HttpReques
 
     override fun channelReadComplete(ctx: ChannelHandlerContext) {
         ctx.flush()
-
-        if (ctx.channel().isWritable) {
-            ctx.read()
-        }
-    }
-
-    override fun channelWritabilityChanged(ctx: ChannelHandlerContext) {
-        if (ctx.channel().isWritable) {
-            ctx.read()
-        }
     }
 
     override fun userEventTriggered(ctx: ChannelHandlerContext, evt: Any) {