File 0489-inets-ssl-Remove-reuseaddr-from-benchmarks.patch of Package erlang
From 6eefd30fd12d9731238552a888ce6b517450f387 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 15 Mar 2021 09:34:26 +0100
Subject: [PATCH 1/2] inets,ssl: Remove reuseaddr from benchmarks
---
lib/inets/test/http_test_lib.erl | 3 +--
lib/inets/test/httpd_bench_SUITE.erl | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/inets/test/http_test_lib.erl b/lib/inets/test/http_test_lib.erl
index 779ec91487..fc4a396c38 100644
--- a/lib/inets/test/http_test_lib.erl
+++ b/lib/inets/test/http_test_lib.erl
@@ -78,8 +78,7 @@ dummy_server_init(Caller, ssl, Inet, Extra) ->
ContentCb = proplists:get_value(content_cb, Extra),
SSLOptions = proplists:get_value(ssl, Extra),
Conf = proplists:get_value(conf, Extra),
- BaseOpts = [binary, {reuseaddr,true}, {active, false}, {nodelay, true} |
- SSLOptions],
+ BaseOpts = [binary, {active, false}, {nodelay, true} | SSLOptions],
dummy_ssl_server_init(Caller, BaseOpts, Inet, ContentCb, Conf).
dummy_ssl_server_init(Caller, BaseOpts, Inet, ContentCb, Conf) ->
diff --git a/lib/inets/test/httpd_bench_SUITE.erl b/lib/inets/test/httpd_bench_SUITE.erl
index 1cba527687..bf6cdcb3df 100644
--- a/lib/inets/test/httpd_bench_SUITE.erl
+++ b/lib/inets/test/httpd_bench_SUITE.erl
@@ -280,9 +280,9 @@ cert_opts(Config) ->
"server", "key.pem"]),
ClientKeyFile = filename:join([?config(priv_dir, Config),
"client", "key.pem"]),
- [{server_verification_opts, [{reuseaddr, true},
- {cacertfile, ServerCaCertFile},
- {ciphers, ["ECDHE-RSA-AES256-GCM-SHA384"]},
+ [{server_verification_opts, [{cacertfile, ServerCaCertFile},
+ {ciphers, ["ECDHE-RSA-AES256-GCM-SHA384",
+ "TLS_AES_256_GCM_SHA384"]},
{certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
{client_verification_opts, [
%%{verify, verify_peer},
@@ -518,7 +518,7 @@ start_dummy("https" = Protocol, Config) ->
%% DataDir= ?config(data_dir, Config),
Host = ?config(server_host, Config),
SSLOpts = proplists:get_value(server_verification_opts, cert_opts(Config)),
- Opts = [{active, true}, {nodelay, true}, {reuseaddr, true} | SSLOpts],
+ Opts = [{active, true}, {nodelay, true} | SSLOpts],
Conf = [%%{big, filename:join(DataDir, "1M_file")},
%%{small, filename:join(DataDir, "1k_file")},
{big, {gen, crypto:strong_rand_bytes(1000000)}},
--
2.26.2