diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-16 12:05:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-16 12:05:32 +0200 |
| commit | 39968c33719b68001fb0e3f51f1d2aaa0cc4a612 (patch) | |
| tree | 122238e9e446d33cff233a145311dd1f4ec230e4 /lib/ssl/src | |
| parent | 4a809e4a7cf666afbffe3fd94d88c78f2c261a7b (diff) | |
| parent | 062046d8a6bfee63e53f0342eaea58e9d50e1306 (diff) | |
| download | otp-39968c33719b68001fb0e3f51f1d2aaa0cc4a612.tar.gz otp-39968c33719b68001fb0e3f51f1d2aaa0cc4a612.tar.bz2 otp-39968c33719b68001fb0e3f51f1d2aaa0cc4a612.zip | |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Support explicit use of packet option httph and httph_bin
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 049354c19b..79ee054200 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1800,7 +1800,8 @@ format_reply(binary, _, N, Data) when N > 0 -> % Header mode format_reply(binary, _, _, Data) -> Data; format_reply(list, Packet, _, Data) - when Packet == http; Packet == {http, headers}; Packet == http_bin; Packet == {http_bin, headers} -> + when Packet == http; Packet == {http, headers}; Packet == http_bin; Packet == {http_bin, headers}; Packet == httph; + Packet == httph_bin-> Data; format_reply(list, _,_, Data) -> binary_to_list(Data). @@ -2112,7 +2113,9 @@ set_socket_opts(Socket, [{packet, Packet}| Opts], SockOpts, Other) when Packet = Packet == tpkt; Packet == line; Packet == http; - Packet == http_bin -> + Packet == httph; + Packet == http_bin; + Packet == httph_bin -> set_socket_opts(Socket, Opts, SockOpts#socket_options{packet = Packet}, Other); set_socket_opts(_, [{packet, _} = Opt| _], SockOpts, _) -> |