diff options
| author | Lars Thorsen <[email protected]> | 2011-12-05 15:02:51 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-12-05 15:02:51 +0100 |
| commit | 348a15766cdec257d27adbddeb55926ca52e2fd9 (patch) | |
| tree | 31713ad933f3b810ddc21e07c71754a3834f946e /lib/orber/src/orber_socket.erl | |
| parent | 27e3d767e0dd10ab4360559cfeead6977feddda6 (diff) | |
| parent | 8ad9f2bee9ca779988aa5634906751b30b07156e (diff) | |
| download | otp-348a15766cdec257d27adbddeb55926ca52e2fd9.tar.gz otp-348a15766cdec257d27adbddeb55926ca52e2fd9.tar.bz2 otp-348a15766cdec257d27adbddeb55926ca52e2fd9.zip | |
Merge branch 'lars/orber/ssl-options/OTP-9773'
* lars/orber/ssl-options/OTP-9773:
[orber] Change the option handling for ssl
Diffstat (limited to 'lib/orber/src/orber_socket.erl')
| -rw-r--r-- | lib/orber/src/orber_socket.erl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/orber/src/orber_socket.erl b/lib/orber/src/orber_socket.erl index ec2cf8f42a..07a0e09ccc 100644 --- a/lib/orber/src/orber_socket.erl +++ b/lib/orber/src/orber_socket.erl @@ -14,8 +14,7 @@ %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% -%% %CopyrightEnd% +%%%% %CopyrightEnd% %% %% %%----------------------------------------------------------------- @@ -37,7 +36,7 @@ %%----------------------------------------------------------------- -export([start/0, connect/4, listen/3, listen/4, accept/2, accept/3, write/3, controlling_process/3, close/2, peername/2, sockname/2, - peerdata/2, peercert/2, sockdata/2, setopts/3, + peerdata/2, peercert/2, sockdata/2, setopts/3, clear/2, shutdown/3, post_accept/2, post_accept/3]). %%----------------------------------------------------------------- @@ -75,8 +74,6 @@ connect(Type, Host, Port, Options) -> case Type of normal -> [{keepalive, orber_env:iiop_out_keepalive()}|Options1]; - _ when Generation > 2 -> - [{keepalive, orber_env:iiop_ssl_out_keepalive()}|Options1]; _ -> Options1 end, @@ -251,8 +248,7 @@ listen(ssl, Port, Options, Exception) -> end, Options4 = if Generation > 2 -> - [{reuseaddr, true}, - {keepalive, orber_env:iiop_ssl_in_keepalive()}|Options3]; + [{reuseaddr, true} |Options3]; true -> Options3 end, @@ -362,8 +358,8 @@ peercert(ssl, Socket) -> ssl:peercert(Socket); peercert(Type, _Socket) -> orber:dbg("[~p] orber_socket:peercert(~p);~n" - "Only available for SSL sockets.", - [?LINE, Type], ?DEBUG_LEVEL), + "Only available for SSL sockets.", + [?LINE, Type], ?DEBUG_LEVEL), {error, ebadsocket}. %%----------------------------------------------------------------- |