diff options
| author | Niclas Eklund <[email protected]> | 2010-12-10 16:53:50 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2010-12-10 16:53:50 +0100 |
| commit | e10e306098b6f331ec683147e34a4a745900c144 (patch) | |
| tree | 7b3a1c0907ece434caf57d1088e1693bdf7e5754 | |
| parent | caa311d4a2b5fb229d9369c7667b062b34945b36 (diff) | |
| download | otp-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.
| -rw-r--r-- | lib/orber/doc/src/notes.xml | 14 | ||||
| -rw-r--r-- | lib/orber/src/orber_socket.erl | 16 | ||||
| -rw-r--r-- | lib/orber/vsn.mk | 26 |
3 files changed, 18 insertions, 38 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml index 6eda16a517..64db43921a 100644 --- a/lib/orber/doc/src/notes.xml +++ b/lib/orber/doc/src/notes.xml @@ -33,6 +33,20 @@ </header> <section> + <title>Orber 3.6.19</title> + <section> + <title>Fixed Bugs and Malfunctions</title> + <list type="bulleted"> + <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> + </item> + </list> + </section> + </section> + + <section> <title>Orber 3.6.18</title> <section> <title>Fixed Bugs and Malfunctions</title> 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 c405326e9a..c265db188f 100644 --- a/lib/orber/vsn.mk +++ b/lib/orber/vsn.mk @@ -1,27 +1,3 @@ -ORBER_VSN = 3.6.18 +ORBER_VSN = 3.6.19 -TICKETS = OTP-8900 - -TICKETS_3.6.17 = OTP-8840 - -TICKETS_3.6.16 = OTP-8543 \ - OTP-8489 - -TICKETS_3.6.15 = OTP-8353 \ - OTP-8354 \ - OTP-8374 \ - OTP-8409 \ - OTP-8448 - -TICKETS_3.6.14 = OTP-8201 - -TICKETS_3.6.14 = OTP-8201 - -TICKETS_3.6.13 = OTP-7987 - -TICKETS_3.6.12 = OTP-7906 - -TICKETS_3.6.11 = OTP-7837 - -TICKETS_3.6.10 = OTP-7595 |