diff options
| author | Sverker Eriksson <[email protected]> | 2011-12-07 14:20:55 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-12-07 14:20:55 +0100 |
| commit | f7241e210c333b088210a138c0880aa93d1f7780 (patch) | |
| tree | a8c4620af57b908468881864b48866f5c71500c5 /erts/doc | |
| parent | 2e5639155e153ba4869d7671d1a7becd5e07dc1a (diff) | |
| parent | dc5f7190f16cf4552db74fba3f4e0f2d654e2594 (diff) | |
| download | otp-f7241e210c333b088210a138c0880aa93d1f7780.tar.gz otp-f7241e210c333b088210a138c0880aa93d1f7780.tar.bz2 otp-f7241e210c333b088210a138c0880aa93d1f7780.zip | |
Merge branch 'sverk/packet_size-http/OTP-9389'
* sverk/packet_size-http/OTP-9389:
erts: Remove truncation of http packet parsing and return error instead
honor packet_size for http packet parsing to fix OTP-9389
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erlang.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index eac7db5eaa..a603d5c2b8 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -724,9 +724,12 @@ false</pre> size limit.</p> </item> <tag><c>{line_length, integer()}</c></tag> - <item><p>Applies only to line oriented protocols - (<c>line</c>, <c>http</c>). Lines longer than this - will be truncated.</p> + <item><p>For packet type <c>line</c>, truncate lines longer + than the indicated length.</p> + <p>Option <c>line_length</c> also applies to <c>http*</c> + packet types as an alias for option <c>packet_size</c> in the + case when <c>packet_size</c> itself is not set. This usage is + only intended for backward compatibility.</p> </item> </taglist> <pre> |