maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove headers timeout hack, rely on nodejs timeouts (#83419)

Browse source
This commit is contained in:
Mikhail Shustov 2020-11-17 14:28:41 +03:00 committed by GitHub
parent 95ff10b47a
commit 48231c8400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,10 +103,6 @@ interface ListenerOptions {
export function createServer(serverOptions: ServerOptions, listenerOptions: ListenerOptions) {
const server = new Server(serverOptions);
// remove fix + test as soon as update node.js to v12.19 https://github.com/elastic/kibana/pull/61587
server.listener.headersTimeout =
listenerOptions.keepaliveTimeout + 2 * server.listener.headersTimeout;
server.listener.keepAliveTimeout = listenerOptions.keepaliveTimeout;
server.listener.setTimeout(listenerOptions.socketTimeout);
server.listener.on('timeout', (socket) => {

4
test/server_integration/http/platform/headers.ts
View file

@ -31,7 +31,7 @@ export default function ({ getService }: FtrProviderContext) {
const config = getService('config');
describe('headers timeout ', () => {
it('issue-73849', async () => {
it('handles correctly. See issue #73849', async () => {
const agent = new Http.Agent({
keepAlive: true,
});
@ -74,7 +74,7 @@ export default function ({ getService }: FtrProviderContext) {
}
await performRequest();
const defaultHeadersTimeout = 40 * oneSec;
const defaultHeadersTimeout = 60 * oneSec;
await delay(defaultHeadersTimeout + oneSec);
await performRequest();
});