do not respond on already responded incoming request

elastic · Oct 1, 2021 · dc1e1b1 · dc1e1b1
1 parent ff96b66
commit dc1e1b1
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/core/server/http/router/response_adapter.ts b/src/core/server/http/router/response_adapter.ts
@@ -72,6 +72,9 @@ export class HapiResponseAdapter {
   }
 
   private toHapiResponse(kibanaResponse: KibanaResponse) {
+    if (this.isAlreadyAborted()) {
+      return this.responseToolkit.close;
+    }
     if (kibanaResponse.options.bypassErrorFormat) {
       return this.toSuccess(kibanaResponse);
     }
@@ -145,6 +148,13 @@ export class HapiResponseAdapter {
 
     return error;
   }
+
+  private isAlreadyAborted() {
+    return (
+      this.responseToolkit.request.raw.req.aborted === true &&
+      this.responseToolkit.request.active() === false
+    );
+  }
 }
 
 function getErrorMessage(payload?: ResponseError): string {