diff options
| author | Erlang/OTP <[email protected]> | 2010-02-12 10:29:45 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-12 10:29:45 +0000 |
| commit | 96ceb366d9f600e645516f24396c976fb738182a (patch) | |
| tree | 65517b7865a8edb136c9ef7b90e120d1389cfd37 /lib/ssl/src/ssl_broker.erl | |
| parent | 9e009689743b32168ec0b5be8cb113d5867fec3f (diff) | |
| parent | 464f2bac3b5dadd35add52fdee2ccfe8e05facd9 (diff) | |
| download | otp-96ceb366d9f600e645516f24396c976fb738182a.tar.gz otp-96ceb366d9f600e645516f24396c976fb738182a.tar.bz2 otp-96ceb366d9f600e645516f24396c976fb738182a.zip | |
Merge branch 'yh/packet_option_for_new_ssl_send' into ccase/r13b04_dev
* yh/packet_option_for_new_ssl_send:
Fixed ssl:setopts(Socket, binary) which was didn't work for 'new' ssl.
Fixed bug file cache bug and improved the error messages.
Allow <c>ssl:listen/2</c> to be called with option {ssl_imp, old}.
prepend packet size bytes in ssl:send() in new_ssl implementation
OTP-8441 ssl:send/2 ignored packet option, fix provided by YAMASHINA Hio.
Fixed a file cache bug which caused problems when the same file
was used for both cert and cacert.
Allow ssl:listen/2 to be called with option {ssl_imp, old}.
Fixed ssl:setopts(Socket, binary) which didn't work for 'new'
ssl..
Diffstat (limited to 'lib/ssl/src/ssl_broker.erl')
| -rw-r--r-- | lib/ssl/src/ssl_broker.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/ssl/src/ssl_broker.erl b/lib/ssl/src/ssl_broker.erl index 178fb5fcb9..7ef88baf2b 100644 --- a/lib/ssl/src/ssl_broker.erl +++ b/lib/ssl/src/ssl_broker.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 1999-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% @@ -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. %% |