diff options
| author | olgeni <olgeni@FreeBSD.org> | 2012-11-30 05:42:28 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2012-11-30 05:42:28 +0800 |
| commit | 05e27c74d87cd8f239c1349b4db5d505655b7eba (patch) | |
| tree | a1a523b6df5ebb10f55fe394d2de9f33c3946671 /lang/erlang | |
| parent | 4c494109e3334a02030144203d67d68d1845e0e8 (diff) | |
| download | freebsd-ports-gnome-05e27c74d87cd8f239c1349b4db5d505655b7eba.tar.gz freebsd-ports-gnome-05e27c74d87cd8f239c1349b4db5d505655b7eba.tar.zst freebsd-ports-gnome-05e27c74d87cd8f239c1349b4db5d505655b7eba.zip | |
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
Diffstat (limited to 'lang/erlang')
| -rw-r--r-- | lang/erlang/Makefile | 1 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index e1a9dcb8fc75..70615e19f6a3 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -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 \ diff --git a/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl b/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl new file mode 100644 index 000000000000..a49983ccc101 --- /dev/null +++ b/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl @@ -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)}; + |