diff --git a/src/core/server/http/router/response_adapter.ts b/src/core/server/http/router/response_adapter.ts index b03449b2ae1946..02152b26d116a0 100644 --- 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 {