github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

close socket timeouts without message (#42456)

Browse source
This commit is contained in:
Jonathan Budzenski 2019-08-09 08:15:08 -05:00 • committed by Jonathan Budzenski
parent a2dd2d0b6a
commit da44c70cbb
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/server/http/http_tools.test.ts
View file

@ -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);

6
src/core/server/http/http_tools.ts
View file

@ -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) {