aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-11-09 15:48:32 +0100
committerIngela Anderton Andin <[email protected]>2015-11-11 14:46:51 +0100
commit51a236b296a07ef488e29e4f1b38ee4d707e8a88 (patch)
tree16295c5dc83329f7e7d86be87d3d78da6d37f0fd
parent4b7be97512d6fc62b337e810f697a6bb0db1773c (diff)
downloadotp-51a236b296a07ef488e29e4f1b38ee4d707e8a88.tar.gz
otp-51a236b296a07ef488e29e4f1b38ee4d707e8a88.tar.bz2
otp-51a236b296a07ef488e29e4f1b38ee4d707e8a88.zip
Inets: Clean up code
Remove point less instructions looking for return values, that in most cases no long exist, of which the result would anyhow be ignored
-rw-r--r--lib/inets/src/http_lib/http_transport.erl14
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index e3d7382043..ddfd6a030e 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -499,16 +499,4 @@ negotiate({essl, _}, Socket, Timeout) ->
negotiate_ssl(Socket, Timeout).
negotiate_ssl(Socket, Timeout) ->
- case ssl:ssl_accept(Socket, Timeout) of
- ok ->
- ok;
- {error, Reason} ->
- %% Look for "valid" error reasons
- ValidReasons = [timeout, econnreset, esslaccept, esslerrssl],
- case lists:member(Reason, ValidReasons) of
- true ->
- {error, normal};
- false ->
- {error, Reason}
- end
- end.
+ ssl:ssl_accept(Socket, Timeout).