From db382d4d392930c9b4e9789605afda51fa710d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@dev-extend.eu>
Date: Mon, 20 Feb 2012 09:31:22 +0100
Subject: Check for upgrades on accept timeout

Otherwise acceptors will not be upgraded properly until after the
next request comes in.

Thanks to DeadZen for pointing it out.
---
 src/cowboy_acceptor.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cowboy_acceptor.erl')

diff --git a/src/cowboy_acceptor.erl b/src/cowboy_acceptor.erl
index 29f7c09..b2a1ef0 100644
--- a/src/cowboy_acceptor.erl
+++ b/src/cowboy_acceptor.erl
@@ -41,7 +41,7 @@ acceptor(LSocket, Transport, Protocol, Opts, OptsVsn, ListenerPid, ReqsSup) ->
 			cowboy_listener:add_connection(ListenerPid,
 				default, Pid, OptsVsn);
 		{error, timeout} ->
-			ok;
+			cowboy_listener:check_upgrades(ListenerPid, OptsVsn);
 		{error, _Reason} ->
 			%% @todo Probably do something here. If the socket was closed,
 			%%       we may want to try and listen again on the port?
-- 
cgit v1.2.3