diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-08-24 16:57:34 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-08-24 16:57:34 +0200 |
| commit | bcaccea17c66dc3a83b61dde0ff8f68f2f4d8b24 (patch) | |
| tree | 184dbea5dcc5df58e8b5a206452fc1b83fafd338 /lib/ssl/src/ssl_connection.erl | |
| parent | 0c402e4f640be1f4cd3b9d45561ee4fa6629f76d (diff) | |
| download | otp-bcaccea17c66dc3a83b61dde0ff8f68f2f4d8b24.tar.gz otp-bcaccea17c66dc3a83b61dde0ff8f68f2f4d8b24.tar.bz2 otp-bcaccea17c66dc3a83b61dde0ff8f68f2f4d8b24.zip | |
Handling of {mode, list}
Fixed handling of the option {mode, list} that was broken for some
packet types for instance line.
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index a2ecd91552..76422155a5 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1738,12 +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(binary, _, _, Data) -> + Data; format_reply(list, Packet, _, Data) - when is_integer(Packet); Packet == raw; Packet == line -> - binary_to_list(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, <<>>) -> <<>>; |