aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/src
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-12-10 16:53:50 +0100
committerNiclas Eklund <[email protected]>2010-12-10 16:53:50 +0100
commite10e306098b6f331ec683147e34a4a745900c144 (patch)
tree7b3a1c0907ece434caf57d1088e1693bdf7e5754 /lib/orber/src
parentcaa311d4a2b5fb229d9369c7667b062b34945b36 (diff)
downloadotp-e10e306098b6f331ec683147e34a4a745900c144.tar.gz
otp-e10e306098b6f331ec683147e34a4a745900c144.tar.bz2
otp-e10e306098b6f331ec683147e34a4a745900c144.zip
The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this.
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.