aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-18 09:26:15 +0200
committerIngela Anderton Andin <[email protected]>2015-09-18 09:26:15 +0200
commit9dd273b13047847d9b268a078aa1aa0ad0f00382 (patch)
tree9bece98454c62b3aa568d545e4c964db206cceee /lib
parent76dd921ad99aa3ef98424a2f1c4bc8de66e766e2 (diff)
parent9d5aa4ee276c142e9800262333103be5da600a53 (diff)
downloadotp-9dd273b13047847d9b268a078aa1aa0ad0f00382.tar.gz
otp-9dd273b13047847d9b268a078aa1aa0ad0f00382.tar.bz2
otp-9dd273b13047847d9b268a078aa1aa0ad0f00382.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src2
-rw-r--r--lib/inets/vsn.mk2
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl5
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index d3da76d789..a9fbb1c3f7 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,9 +18,11 @@
%% %CopyrightEnd%
{"%VSN%",
[
+ {<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
+ {<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
]
}.
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 5395df1d07..a6aeedfe12 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.0
+INETS_VSN = 6.0.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 82c3c4ac74..6f6107de2c 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -3983,13 +3983,16 @@ connect_dist_c(S) ->
tls_downgrade(Socket) ->
ok = ssl_test_lib:send_recv_result(Socket),
- case ssl:close(Socket, {self(), 5000}) of
+ case ssl:close(Socket, {self(), 10000}) of
{ok, TCPSocket} ->
inet:setopts(TCPSocket, [{active, true}]),
gen_tcp:send(TCPSocket, "Downgraded"),
receive
{tcp, TCPSocket, <<"Downgraded">>} ->
ok;
+ {tcp_closed, TCPSocket} ->
+ ct:pal("Peer timed out, downgrade aborted"),
+ ok;
Other ->
{error, Other}
end;