diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-11-09 15:09:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-11-11 14:46:23 +0100 |
| commit | 4b7be97512d6fc62b337e810f697a6bb0db1773c (patch) | |
| tree | 77927f0f07f49f7b4a49634b6c37416b458e66cb /lib/inets/doc/src | |
| parent | f05f7ae5e8ea4b19be5fa49681ad6efb01daae6d (diff) | |
| download | otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.tar.gz otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.tar.bz2 otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.zip | |
inets: httpd - Add possibility to specify socket options for HTTP
Was already possible for HTTPS. Also remove use of legacy option
inet6fb4. IPv6 standard moved away from beeing able to fallback to IPv4
so this option makes little sense, will use inet (Ipv4) as default instead of
inet6fb4.
Diffstat (limited to 'lib/inets/doc/src')
| -rw-r--r-- | lib/inets/doc/src/httpd.xml | 13 |
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> |