aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-11-12 10:50:12 +0100
committerErlang/OTP <[email protected]>2015-11-12 10:50:12 +0100
commit29e1771c44d7d12ab7f0a52e1286886973d3b525 (patch)
tree79431c2e8f5f3e775d2d33444f51176496a6a89f /lib/inets/doc
parentfe1df7fc6bf050cb6c9bbd99eb9393c426b62f67 (diff)
parent35214e082400c8a0a072308986271a28a7a1cc30 (diff)
downloadotp-29e1771c44d7d12ab7f0a52e1286886973d3b525.tar.gz
otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.tar.bz2
otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.zip
Merge branch 'ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062' into maint-18
* ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062: inets: Prepare for release inets: Do not use internal or shell convenience functions in application Inets: Clean up code inets: httpd - Add possibility to specify socket options for HTTP inets: Remove debug macros that mimic call trace inets: Improve max header size handling inets: CT'ify http_format_SUITE inets: Terminate gracfully when an invalid chunked length header is encountered
Diffstat (limited to 'lib/inets/doc')
-rw-r--r--lib/inets/doc/src/httpd.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 2a4aea41c2..0fc3cb1ce7 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -177,21 +177,22 @@
</item>
<marker id="prop_socket_type"></marker>
- <tag>{socket_type, ip_comm | {essl, Config::proplist()}}</tag>
+ <tag>{socket_type, ip_comm | {ip_comm, Config::proplist()} | {essl, Config::proplist()}}</tag>
<item>
+ <p>For <c>ip_comm</c> configuration options, see
+ <seealso marker="kernel:gen_tcp#listen-2">gen_tcp:listen/2</seealso>, some options
+ that are used internally by httpd can not be set.</p>
<p>For <c>SSL</c> configuration options, see
<seealso marker="ssl:ssl#listen-2">ssl:listen/2</seealso>.</p>
<p>Default is <c>ip_comm</c>.</p>
</item>
<marker id="prop_ipfamily"></marker>
- <tag>{ipfamily, inet | inet6 | inet6fb4}</tag>
+ <tag>{ipfamily, inet | inet6}</tag>
<item>
- <p>This option is only used when option
- <c>socket_type</c> has value <c>ip_comm</c>.</p>
- <p>Default is <c>inet6fb4</c>.</p>
+ <p>Default is <c>inet</c>, legacy option <c>inet6fb4</c> no longer makes sense and will be translated
+ to inet.</p>
</item>
-
<marker id="prop_minimum_bytes_per_second"></marker>
<tag>{minimum_bytes_per_second, integer()}</tag>