diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-15 15:10:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-02-05 10:32:23 +0100 |
| commit | 1623d54ce6a552eb6802519c0ffe1f3616fab4aa (patch) | |
| tree | d051d21bb153cd846cf37e52b212160b06e9184a | |
| parent | 5bf88f6341c8414ce59b0c069b106ed044cf1bc4 (diff) | |
| download | otp-1623d54ce6a552eb6802519c0ffe1f3616fab4aa.tar.gz otp-1623d54ce6a552eb6802519c0ffe1f3616fab4aa.tar.bz2 otp-1623d54ce6a552eb6802519c0ffe1f3616fab4aa.zip | |
[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel added as option to inets conf file
Conflicts:
lib/inets/src/http_lib/http_transport.erl
lib/inets/src/inets_app/inets.appup.src
lib/ssl/src/ssl.appup.src
| -rw-r--r-- | lib/inets/src/http_lib/http_transport.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl index 6ac95a9572..b59b3a781b 100644 --- a/lib/inets/src/http_lib/http_transport.erl +++ b/lib/inets/src/http_lib/http_transport.erl @@ -159,7 +159,7 @@ listen(ip_comm = _SocketType, Addr, Port, Fd, IpFamily) -> listen_ip_comm(Addr, Port, Fd, IpFamily); listen({essl, SSLConfig}, Addr, Port, Fd, IpFamily) -> - listen_ssl(Addr, Port, Fd, SSLConfig, IpFamily). + listen_ssl(Addr, Port, Fd, SSLConfig, IpFamily, []). listen(ip_comm = _SocketType, Addr, Port, IpFamily) -> listen_ip_comm(Addr, Port, undefined, IpFamily); |