close socket timeouts without message (#42456)

elastic · Aug 9, 2019 · da44c70 · da44c70
1 parent a2dd2d0
commit da44c70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/core/server/http/http_tools.test.ts b/src/core/server/http/http_tools.test.ts
@@ -69,7 +69,7 @@ describe('timeouts', () => {
   const logger = loggingServiceMock.create();
   const server = new HttpServer(logger, 'foo');
 
-  test('returns 408 on timeout error', async () => {
+  test('closes sockets on timeout', async () => {
     const router = new Router('');
     router.get({ path: '/a', validate: false }, async (req, res) => {
       await new Promise(resolve => setTimeout(resolve, 2000));
@@ -87,9 +87,8 @@ describe('timeouts', () => {
 
     await server.start();
 
-    await supertest(innerServer.listener)
-      .get('/a')
-      .expect(408);
+    expect(supertest(innerServer.listener).get('/a')).rejects.toThrow('socket hang up');
+
     await supertest(innerServer.listener)
       .get('/b')
       .expect(200);

diff --git a/src/core/server/http/http_tools.ts b/src/core/server/http/http_tools.ts
@@ -97,11 +97,7 @@ export function createServer(serverOptions: ServerOptions, listenerOptions: List
   server.listener.keepAliveTimeout = listenerOptions.keepaliveTimeout;
   server.listener.setTimeout(listenerOptions.socketTimeout);
   server.listener.on('timeout', socket => {
-    if (socket.writable) {
-      socket.end(Buffer.from('HTTP/1.1 408 Request Timeout\r\n\r\n', 'ascii'));
-    } else {
-      socket.destroy();
-    }
+    socket.destroy();
   });
   server.listener.on('clientError', (err, socket) => {
     if (socket.writable) {