diff options
| author | Erlang/OTP <[email protected]> | 2015-04-10 13:09:50 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-04-10 13:09:50 +0200 |
| commit | ed8b9b2d95203b2cfec53d346c768480ade7d9ae (patch) | |
| tree | a139faa1c24231c767a97fc33a653ccfc087b724 /lib/ssh/src/ssh_acceptor.erl | |
| parent | 545890576542e4be630df8772654b99bd0306f62 (diff) | |
| parent | af095b98e089e3a4a5db5012dbdc0d579367a907 (diff) | |
| download | otp-ed8b9b2d95203b2cfec53d346c768480ade7d9ae.tar.gz otp-ed8b9b2d95203b2cfec53d346c768480ade7d9ae.tar.bz2 otp-ed8b9b2d95203b2cfec53d346c768480ade7d9ae.zip | |
Merge branch 'ia/ssh/packet_size0/OTP-12645' into maint-17
* ia/ssh/packet_size0/OTP-12645:
ssh: Reset upgrade instructions to default
ssh: Change version (vsn.mk)
ssh: Option minimal_remote_max_packet_size and test cases
ssh: fix loop bug for zero maximum_packet_size.
ssh: Add ssh_info:print/1 to write onto a file descriptor
ssh: Add {active, false} to ssh listen socket
ssh: Change send_buf implementation from list to queue
ssh: Remove error report
Diffstat (limited to 'lib/ssh/src/ssh_acceptor.erl')
| -rw-r--r-- | lib/ssh/src/ssh_acceptor.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl index 6c443eeb9c..34988f17b6 100644 --- a/lib/ssh/src/ssh_acceptor.erl +++ b/lib/ssh/src/ssh_acceptor.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2015. 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 @@ -43,7 +43,7 @@ start_link(Port, Address, SockOpts, Opts, AcceptTimeout) -> acceptor_init(Parent, Port, Address, SockOpts, Opts, AcceptTimeout) -> {_, Callback, _} = proplists:get_value(transport, Opts, {tcp, gen_tcp, tcp_closed}), - case (catch do_socket_listen(Callback, Port, SockOpts)) of + case (catch do_socket_listen(Callback, Port, [{active, false} | SockOpts])) of {ok, ListenSocket} -> proc_lib:init_ack(Parent, {ok, self()}), acceptor_loop(Callback, |