diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-31 15:34:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-02-18 18:02:59 +0100 |
| commit | baca1b6cf223b03786ea47fc101f4249bda3cb3c (patch) | |
| tree | d5c733444f16e34188f7bc3d9bedf24c35ef63d5 /lib/inets/src/http_lib | |
| parent | 79f4745f6e7254a5399c63f9947dc39c1abd21ba (diff) | |
| download | otp-baca1b6cf223b03786ea47fc101f4249bda3cb3c.tar.gz otp-baca1b6cf223b03786ea47fc101f4249bda3cb3c.tar.bz2 otp-baca1b6cf223b03786ea47fc101f4249bda3cb3c.zip | |
inets: Improve ssl handling
httpc: CTfy test suite
httpd: Simplify ssl configuration OTP-10846
Diffstat (limited to 'lib/inets/src/http_lib')
| -rw-r--r-- | lib/inets/src/http_lib/http_transport.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl index 5eb827032f..badc3789ba 100644 --- a/lib/inets/src/http_lib/http_transport.erl +++ b/lib/inets/src/http_lib/http_transport.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2011. All Rights Reserved. +%% Copyright Ericsson AB 2004-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -178,7 +178,9 @@ listen({essl, SSLConfig}, Addr, Port) -> listen(ip_comm, Addr, Port, Fd) -> - listen_ip_comm(Addr, Port, Fd). + listen_ip_comm(Addr, Port, Fd); +listen({_, SSLConfig}, Addr, Port, _Fd) -> + listen_ssl(Addr, Port, SSLConfig). listen_ip_comm(Addr, Port, Fd) -> case (catch do_listen_ip_comm(Addr, Port, Fd)) of |