diff options
| author | Björn Gustavsson <[email protected]> | 2010-09-10 10:44:15 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-10 10:44:15 +0200 |
| commit | c2d085e76f38467ea530b294edd3767ade88332c (patch) | |
| tree | 0662a27795b1a1bd9bb50f9a25d2d14432fc26c1 /lib/kernel/doc/src | |
| parent | d90480306e4fcd3abc9717034a38868f639d45b1 (diff) | |
| parent | 33caf70b63ef4cdb7ba5f3b24d7f04c596f081eb (diff) | |
| download | otp-c2d085e76f38467ea530b294edd3767ade88332c.tar.gz otp-c2d085e76f38467ea530b294edd3767ade88332c.tar.bz2 otp-c2d085e76f38467ea530b294edd3767ade88332c.zip | |
Merge branch 'bjorn/http-packet-error/OTP-8831' into dev
* bjorn/http-packet-error/OTP-8831:
Make gen_tcp:recv/2 consistent with ssl:recv/2
Diffstat (limited to 'lib/kernel/doc/src')
| -rw-r--r-- | lib/kernel/doc/src/gen_tcp.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml index 032dcc5251..8e7192a496 100644 --- a/lib/kernel/doc/src/gen_tcp.xml +++ b/lib/kernel/doc/src/gen_tcp.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1997</year><year>2009</year> + <year>1997</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -284,9 +284,10 @@ socket() <type> <v>Socket = socket()</v> <v>Length = int()</v> - <v>Packet = [char()] | binary()</v> + <v>Packet = [char()] | binary() | HttpPacket</v> <v>Timeout = int() | infinity</v> <v>Reason = closed | posix()</v> + <v>HttpPacket = see the description of <c>HttpPacket</c> in <seealso marker="erts:erlang#decode_packet/3">erlang:decode_packet/3</seealso></v> </type> <desc> <p>This function receives a packet from a socket in passive |