diff options
| author | Péter Dimitrov <[email protected]> | 2018-04-17 10:54:28 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-04-17 10:54:28 +0200 |
| commit | 19256441771c191bcc971377e438cfa859246c55 (patch) | |
| tree | a7d8b3cc36e3c703007f51e2707b4c750225ea01 /lib/inets/doc | |
| parent | 61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622 (diff) | |
| parent | 1986e3746f495519c04d540683d1b9b78548b870 (diff) | |
| download | otp-19256441771c191bcc971377e438cfa859246c55.tar.gz otp-19256441771c191bcc971377e438cfa859246c55.tar.bz2 otp-19256441771c191bcc971377e438cfa859246c55.zip | |
Merge branch 'peterdmv/httpc_options_handling/ERL-441/OTP-15007' into maint
* peterdmv/httpc_options_handling/ERL-441/OTP-15007:
inets: Fix broken httpc options handling
Change-Id: Ib05f5718c46128bb2aca7c3962bd94e9fa244da0
Diffstat (limited to 'lib/inets/doc')
| -rw-r--r-- | lib/inets/doc/src/httpc.xml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml index befcd83827..1ef93de301 100644 --- a/lib/inets/doc/src/httpc.xml +++ b/lib/inets/doc/src/httpc.xml @@ -450,17 +450,22 @@ <tag><c><![CDATA[socket_opts]]></c></tag> <item> - <p>Socket options to be used for this and subsequent - requests.</p> + <p>Socket options to be used for this request.</p> <p>Overrides any value set by function <seealso marker="#set_options-1">set_options</seealso>.</p> <p>The validity of the options is <em>not</em> checked by the HTTP client they are assumed to be correct and passed on to ssl application and inet driver, which may reject - them if they are not correct. Note that the current - implementation assumes the requests to the same host, port - combination will use the same socket options. + them if they are not correct. </p> + <note> + <p> + Persistent connections are not supported when setting the + <c>socket_opts</c> option. When <c>socket_opts</c> is not + set the current implementation assumes the requests to the + same host, port combination will use the same socket options. + </p> + </note> <p>By default the socket options set by function <seealso marker="#set_options-1">set_options/[1,2]</seealso> @@ -633,8 +638,11 @@ to complete. The HTTP/1.1 specification suggests a limit of two persistent connections per server, which is the default value of option <c>max_sessions</c>.</p> + <p> + The current implementation assumes the requests to the same host, port + combination will use the same socket options. + </p> </note> - <marker id="get_options"></marker> </desc> </func> |