Commits

Oscar Hellström  committed f98f66b Merge

Merged with bitbucket changes.

  • Participants
  • Parent commits 5dd6dd5, fce3c41

Comments (0)

Files changed (1)

File src/gen_tcpd.erl

 	start_acceptors(Acceptors - 1, Callback, CState, Socket, SSLTimeout).
 
 %% @hidden
+-spec init_acceptor(pid(), atom(), term(), any(), timeout()) -> _.
 init_acceptor(Parent, Callback, CState, Socket, SSLTimeout) ->
 	link(Parent),
 	accept(Parent, Callback, CState, Socket, SSLTimeout).
 			Args = [Parent, Callback, CState, Socket, SSLTimeout],
 			spawn(?MODULE, init_acceptor, Args),
 			Callback:handle_connection(Client, CState);
-		{error, {ssl, ssl_accept}, timeout} -> % SSL negotiation timed out
+		{error, {{ssl, ssl_accept}, timeout}} -> % SSL negotiation timed out
 			accept(Parent, Callback, CState, Socket, SSLTimeout);
 		{error, {_, closed}} ->
 			unlink(Parent), % no need to send exit signals here
 module(Type) -> Type.
 
 %% @hidden
+-spec behaviour_info(any()) -> [{atom(), non_neg_integer()}] | ok.
 behaviour_info(callbacks) ->
 	[{init, 1}, {handle_connection, 2}, {handle_info, 2}, {terminate, 2}];
 behaviour_info(_) ->