diff options
| author | Sverker Eriksson <[email protected]> | 2011-09-16 19:04:57 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-09-16 19:04:57 +0200 |
| commit | adbad8f580825761238c647e181a07678f07d361 (patch) | |
| tree | 08201ea40c7760ebea58d5c28352b208afdb9dde /lib | |
| parent | 9be7dd2a73f8c714fdf85b5ec660eabaebb4bd30 (diff) | |
| parent | 9d1b6de75122c940333fe86b931771cc6f2d67e2 (diff) | |
| download | otp-adbad8f580825761238c647e181a07678f07d361.tar.gz otp-adbad8f580825761238c647e181a07678f07d361.tar.bz2 otp-adbad8f580825761238c647e181a07678f07d361.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index b36c28e027..fad5af85bb 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -555,8 +555,14 @@ fe80::204:acff:fe17:bf38 mode will return <c>{ok, HttpPacket}</c> from <c>gen_tcp:recv</c> while an active socket will send messages like <c>{http, Socket, HttpPacket}</c>.</p> - <p>Note that the packet type <c>httph</c> is not - needed when reading from a socket.</p> + </item> + <tag><c>httph | httph_bin</c></tag> + <item> + <p>These two types are often not needed as the socket will + automatically switch from <c>http</c>/<c>http_bin</c> to + <c>httph</c>/<c>httph_bin</c> internally after the first line + has been read. There might be occasions however when they are + useful, such as parsing trailers from chunked encoding.</p> </item> </taglist> </item> |