diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-08-25 09:27:41 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-08-25 09:27:41 +0200 |
| commit | 3f11eeaaedf24d15c3a6e8cb19d8421e57d14962 (patch) | |
| tree | e15fc5605fc79b2678a24bd6619728d8561ce20e /lib/ssl/src | |
| parent | 6b6d93d8cb0af40b04890e1986b05ed793eacde2 (diff) | |
| parent | bcaccea17c66dc3a83b61dde0ff8f68f2f4d8b24 (diff) | |
| download | otp-3f11eeaaedf24d15c3a6e8cb19d8421e57d14962.tar.gz otp-3f11eeaaedf24d15c3a6e8cb19d8421e57d14962.tar.bz2 otp-3f11eeaaedf24d15c3a6e8cb19d8421e57d14962.zip | |
Merge branch 'ia/ssl-mode-list-handling/OTP-8785' into dev
* ia/ssl-mode-list-handling/OTP-8785:
Handling of {mode, list}
Correct behaviour if {packet, line} and mode list are given
Change packet_line_decode/1 to not only check binary mode
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 1cf7708743..76422155a5 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1738,11 +1738,13 @@ format_packet_error(#socket_options{active = _, mode = Mode}, Data) -> format_reply(binary, _, N, Data) when N > 0 -> % Header mode header(N, Data); -format_reply(binary, _, _, Data) -> Data; -format_reply(list, Packet, _, Data) when is_integer(Packet); Packet == raw -> - binary_to_list(Data); +format_reply(binary, _, _, Data) -> + Data; +format_reply(list, Packet, _, Data) + when Packet == http; Packet == {http, headers}; Packet == http_bin; Packet == {http_bin, headers} -> + Data; format_reply(list, _,_, Data) -> - Data. + binary_to_list(Data). header(0, <<>>) -> <<>>; |