aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-12-16 14:34:26 +0100
committerErlang/OTP <[email protected]>2010-12-16 14:34:26 +0100
commit15daa43c1d5b953b28c998b30d39cec9ab2514b4 (patch)
tree4652579a41503cbc86ec0719d227015367a0a540
parent73205a499c16781ecd064ec2446d502b3c0d01b6 (diff)
parente10e306098b6f331ec683147e34a4a745900c144 (diff)
downloadotp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.tar.gz
otp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.tar.bz2
otp-15daa43c1d5b953b28c998b30d39cec9ab2514b4.zip
Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r14
* 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
-rw-r--r--lib/orber/doc/src/notes.xml5
-rw-r--r--lib/orber/src/orber_socket.erl16
-rw-r--r--lib/orber/vsn.mk1
3 files changed, 5 insertions, 17 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 1e2cdd05ba..4ac74a4873 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -34,13 +34,12 @@
<section>
<title>Orber 3.6.19</title>
-
<section>
<title>Improvements and New Features</title>
<list type="bulleted">
<item>
<p>
- Partial support for recursive structs and unions.
+ Partial support for recursive structs and unions.
Only available for the erl_corba backend and requires
that Light IFR is used. I.e. the IC option {light_ifr, true}
and that Orber is configured in such a way that Light IFR
@@ -56,7 +55,7 @@
<item>
<p>The SSL option {ssl_imp, old} was not used if ssl_generation was
set to 2. Only R14B was affected by this.</p>
- <p>Own Id: OTP-8994 Aux Id:seq11747</p>
+ <p>Own Id: OTP-8994 Aux Id: seq11747</p>
</item>
</list>
</section>
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.
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index be7e3489af..b0c5a253a2 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,2 +1 @@
ORBER_VSN = 3.6.19
-