diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2020-06-16 07:48:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2020-06-16 07:48:24 +0200 |
| commit | 8dc293bb5a7e0d12e681422c5d672c8554441e0c (patch) | |
| tree | 1ebcd36fab7aa41846cf2ad08cb1130ef8fa7866 /lib/inets/src/http_lib | |
| parent | c0ffd69f3d31278d82c75c818a1ee3ae0cdfe44c (diff) | |
| parent | 6881c9c532c7d9d19f039e2aa80c1d740295d220 (diff) | |
| download | erlang-8dc293bb5a7e0d12e681422c5d672c8554441e0c.tar.gz | |
Merge branch 'ingela/ssl/recv-corner-case/ERIERL-496/OTP-16697' into maint
* ingela/ssl/recv-corner-case/ERIERL-496/OTP-16697:
inets: Handle that inet/ssl:setopt can return error
ftp: Handle that inet/ssl:setopts can return error
ssl: Avoid possible sending an active message to a passive socket
Diffstat (limited to 'lib/inets/src/http_lib')
| -rw-r--r-- | lib/inets/src/http_lib/http_transport.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl index d5e1d71336..d2148a3a8a 100644 --- a/lib/inets/src/http_lib/http_transport.erl +++ b/lib/inets/src/http_lib/http_transport.erl @@ -27,6 +27,7 @@ listen/4, listen/5, accept/2, accept/3, close/2, + close_tag/1, send/3, controlling_process/3, setopts/3, getopts/2, getopts/3, @@ -459,6 +460,11 @@ ipv6_name({A, B, C, D, E, F, G, H}) -> http_util:integer_to_hexlist(H). +close_tag(ip_comm) -> + tcp_closed; +close_tag(_) -> + ssl_closed. + %%%======================================================================== %%% Internal functions %%%======================================================================== |