aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-12-14 17:21:22 +0100
committerErlang/OTP <[email protected]>2010-12-14 17:21:22 +0100
commit06ff115c291c4bb07a728bbeb72f67822e9d4b80 (patch)
treecea5739ba4e858904c17a2a4b26fa23495fc1052 /lib/orber/src
parent34f7f62caf25ef159b63ca4f080e212b8726675f (diff)
parente10e306098b6f331ec683147e34a4a745900c144 (diff)
downloadotp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.tar.gz
otp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.tar.bz2
otp-06ff115c291c4bb07a728bbeb72f67822e9d4b80.zip
Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r13
* nick/orber/old_ssl_option/OTP-8994: The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this. Conflicts: lib/orber/doc/src/notes.xml lib/orber/vsn.mk
Diffstat (limited to 'lib/orber/src')
-rw-r--r--lib/orber/src/orber_socket.erl16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/orber/src/orber_socket.erl b/lib/orber/src/orber_socket.erl
index af6df01b7d..84ed193ebb 100644
--- a/lib/orber/src/orber_socket.erl
+++ b/lib/orber/src/orber_socket.erl
@@ -496,27 +496,17 @@ check_port(Port, _, _) ->
%%-----------------------------------------------------------------
%% Check Options.
-%% We need this as a work-around since the SSL-app doesn't allow us
-%% to pass 'inet' as an option. Also needed for R9B :-(
check_options(normal, Options, _Generation) ->
- case orber:ip_version() of
- inet ->
- Options;
- inet6 ->
- %% Necessary for R9B. Should be [orber:ip_version()|Options];
- [inet6|Options]
- end;
+ [orber:ip_version()|Options];
check_options(ssl, Options, Generation) ->
case orber:ip_version() of
inet when Generation > 2 ->
[{ssl_imp, new}|Options];
inet ->
- Options;
+ [{ssl_imp, old}|Options];
inet6 when Generation > 2 ->
[{ssl_imp, new}, inet6|Options];
inet6 ->
- %% Will fail until SSL supports this option.
- %% Note, we want this happen!
- [inet6|Options]
+ [{ssl_imp, old}, inet6|Options]
end.