Date: Thu, 29 Nov 2012 21:42:29 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307980 - in head/lang/erlang: . files Message-ID: <201211292142.qATLgTwG060914@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Thu Nov 29 21:42:28 2012 New Revision: 307980 URL: http://svnweb.freebsd.org/changeset/ports/307980 Log: Fix timeout issue in ssl_connection.erl. Due to a missing function clause to handle the ssl:ssl_accept-timeout, it was treated as a canceled timeout. Submitted by: Ingela Anderton Andin on erlang-bugs Feature safe: yes Added: head/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl (contents, props changed) Modified: head/lang/erlang/Makefile Modified: head/lang/erlang/Makefile ============================================================================== --- head/lang/erlang/Makefile Thu Nov 29 20:51:45 2012 (r307979) +++ head/lang/erlang/Makefile Thu Nov 29 21:42:28 2012 (r307980) @@ -7,6 +7,7 @@ PORTNAME= erlang PORTVERSION= 15.b.03 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ Added: head/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl Thu Nov 29 21:42:28 2012 (r307980) @@ -0,0 +1,16 @@ + +$FreeBSD$ + +--- lib/ssl/src/ssl_connection.erl.orig ++++ lib/ssl/src/ssl_connection.erl +@@ -986,6 +986,10 @@ + gen_fsm:reply(RecvFrom, {error, timeout}), + {next_state, StateName, State#state{start_or_recv_from = undefined}, get_timeout(State)}; + ++handle_info({cancel_start_or_recv, RecvFrom}, StateName, State) when connection =/= StateName-> ++ gen_fsm:reply(RecvFrom, {error, timeout}), ++ {next_state, StateName, State#state{start_or_recv_from = undefined}, get_timeout(State)}; ++ + handle_info({cancel_start_or_recv, _RecvFrom}, StateName, State) -> + {next_state, StateName, State, get_timeout(State)}; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211292142.qATLgTwG060914>