From 590a06126b813a306455d340f73c88ebfafce29a Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Tue, 9 Feb 2010 15:39:59 +0100
Subject: Allow <c>ssl:listen/2</c> to be called with option {ssl_imp, old}.

---
 lib/ssl/doc/src/new_ssl.xml           | 5 ++---
 lib/ssl/src/ssl.erl                   | 3 ++-
 lib/ssl/src/ssl_broker.erl            | 6 +++---
 lib/ssl/test/old_ssl_active_SUITE.erl | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/doc/src/new_ssl.xml b/lib/ssl/doc/src/new_ssl.xml
index a11919eb51..b642280096 100644
--- a/lib/ssl/doc/src/new_ssl.xml
+++ b/lib/ssl/doc/src/new_ssl.xml
@@ -60,10 +60,9 @@
       very crippled as the control of the ssl-socket was deep
       down in openssl making it hard if not impossible to
       support all inet options, ipv6 and upgrade of a tcp
-      connection to a ssl connection. The alfa version has a
+      connection to a ssl connection. This version has a
       few limitations that will be removed before the ssl-4.0
-      release. Main differences and limitations in the alfa are
-      listed below.</p>
+      release. Main differences and limitations are listed below.</p>
 
     <list type="bulleted">
       <item>New ssl requires the crypto
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 1222fe97fd..306e3f5419 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -129,7 +129,8 @@ listen(Port, Options0) ->
 	    %% so that new and old ssl can be run by the same
 	    %% code, however the option will be ignored by old ssl
 	    %% that hardcodes reuseaddr to true in its portprogram.
-	    Options =  proplists:delete(reuseaddr, Options0),
+	    Options1 = proplists:delete(reuseaddr, Options0),
+	    Options  = proplists:delete(ssl_imp, Options1),
 	    old_listen(Port, Options);
 	Value ->
 	    {error, {eoptions, {ssl_imp, Value}}}
diff --git a/lib/ssl/src/ssl_broker.erl b/lib/ssl/src/ssl_broker.erl
index 178fb5fcb9..a7a8fe0322 100644
--- a/lib/ssl/src/ssl_broker.erl
+++ b/lib/ssl/src/ssl_broker.erl
@@ -333,9 +333,9 @@ init([Client, Type]) ->
 	    debug1(Debug, Type, "in start, client = ~w", [Client]),
 	    {ok, #st{brokertype = Type, server = Server, client = Client,
 		     collector = Client, debug = Debug}};
-		   true  ->
-			  {stop, no_ssl_server}
-		  end.
+	true  ->
+	    {stop, no_ssl_server}
+    end.
 
 
 %%
diff --git a/lib/ssl/test/old_ssl_active_SUITE.erl b/lib/ssl/test/old_ssl_active_SUITE.erl
index fc44fa23dd..26be69c300 100644
--- a/lib/ssl/test/old_ssl_active_SUITE.erl
+++ b/lib/ssl/test/old_ssl_active_SUITE.erl
@@ -145,16 +145,16 @@ sinit_return_chkclose(Config) when list(Config) ->
     ?line {ok, Host} = inet:gethostname(),
 
     LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
+	     {sslopts, [{ssl_imp, old}|SsslOpts]},
 	     {listen, LPort}, 
 	     wait_sync,
 	     lclose],
     ACmds = [{timeout, Timeout}, 
 	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
+	     {send, DataSize}, {recv, DataSize},
 	     await_close],
     CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
+	     {sslopts, [{ssl_imp, old}|CsslOpts]},
 	     {connect, {Host, LPort}},
 	     {recv, DataSize}, {send, DataSize}, 
 	     close],
-- 
cgit v1.2.3