From 21317093285190f854acaf223db2e08f79069757 Mon Sep 17 00:00:00 2001 From: Bartek Walkowicz Date: Thu, 1 Mar 2018 14:49:57 +0100 Subject: Add case for handling infinity for idle/request_timeout Currently cowboy assumes that idle_timeout or request_timeout is a number and always starts timers. Similar situation takes place in case of preface_timeout for http2. This commit adds case for handling infinity as a timeout, allowing to not start mentioned timers. --- src/cowboy_http.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/cowboy_http.erl') diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl index 6a75a1a..2f30279 100644 --- a/src/cowboy_http.erl +++ b/src/cowboy_http.erl @@ -222,8 +222,10 @@ set_timeout(State0=#state{opts=Opts, streams=Streams}) -> [] -> {request_timeout, 5000}; _ -> {idle_timeout, 60000} end, - Timeout = maps:get(Name, Opts, Default), - TimerRef = erlang:start_timer(Timeout, self(), Name), + TimerRef = case maps:get(Name, Opts, Default) of + infinity -> undefined; + Timeout -> erlang:start_timer(Timeout, self(), Name) + end, State#state{timer=TimerRef}. cancel_timeout(State=#state{timer=TimerRef}) -> -- cgit v1.2.3