diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-09-19 12:14:20 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-09-20 14:37:18 +0200 |
| commit | 1e0d466f198842cfed14f4fae906381c39bd2050 (patch) | |
| tree | 235cb51d84caab78cdc39f03c6e56fb4e745c470 /lib/ssl/src/ssl_handshake.erl | |
| parent | 33afc30ff8e59af6b066b2212c6c6e4545758d0f (diff) | |
| download | otp-1e0d466f198842cfed14f4fae906381c39bd2050.tar.gz otp-1e0d466f198842cfed14f4fae906381c39bd2050.tar.bz2 otp-1e0d466f198842cfed14f4fae906381c39bd2050.zip | |
ssl: Changed default behaviour of next protocol negotiation to make
more "sense" (be true to the specification).
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 3b114c1f9c..695721d51a 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -741,10 +741,10 @@ select_next_protocol({error, _Reason}, _NextProtocolSelector) -> ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE); select_next_protocol(Protocols, NextProtocolSelector) -> case NextProtocolSelector(Protocols) of - Protocol when is_binary(Protocol), byte_size(Protocol) > 0 -> - Protocol; - _ -> - ?ALERT_REC(?FATAL, ?INTERNAL_ERROR) % we are broken internally :( api presently stops this but we might let it happen in future + ?NO_PROTOCOL -> + ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE); + Protocol when is_binary(Protocol) -> + Protocol end. handle_renegotiation_info(_, #renegotiation_info{renegotiated_connection = ?byte(0)}, |