aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-06-10 10:30:26 +0200
committerHenrik Nord <[email protected]>2015-06-10 10:30:26 +0200
commiteefcd9cca47152d15b14a10b891e93819390b51d (patch)
tree75b63cec9cbe4a966646af31d39179958b7ee93d /lib/ssl
parent8cd756a528572ae4275e2716428f488cf720f18c (diff)
parente0c0f013f0e70a9a703879a34240ac3f73de0c0a (diff)
downloadotp-eefcd9cca47152d15b14a10b891e93819390b51d.tar.gz
otp-eefcd9cca47152d15b14a10b891e93819390b51d.tar.bz2
otp-eefcd9cca47152d15b14a10b891e93819390b51d.zip
Merge branch 'essen/fix-alpn-test'
* essen/fix-alpn-test: ssl: Fix small error in an ALPN test
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index aca34cb6e9..21ce4c4a29 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1036,7 +1036,7 @@ erlang_client_openssl_server_alpn(Config) when is_list(Config) ->
erlang_server_alpn_openssl_client(Config) when is_list(Config) ->
Data = "From openssl to erlang",
start_erlang_server_and_openssl_client_with_opts(Config,
- [{alpn_advertised_protocols, [<<"spdy/2">>]}],
+ [{alpn_preferred_protocols, [<<"spdy/2">>]}],
"",
Data, fun(Server, OpensslPort) ->
true = port_command(OpensslPort, Data),