diff options
| author | Péter Dimitrov <[email protected]> | 2018-04-17 11:20:06 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-04-17 11:20:06 +0200 |
| commit | 46a89739ebe59bb2d2b44639c9ea9869757d4b58 (patch) | |
| tree | 3ad94db35d388dd97418647abdd7d0dff18623a5 /lib/inets/doc/src | |
| parent | e2dadbf64f36f4f05347d0ef9c22adf350a23365 (diff) | |
| parent | 19256441771c191bcc971377e438cfa859246c55 (diff) | |
| download | otp-46a89739ebe59bb2d2b44639c9ea9869757d4b58.tar.gz otp-46a89739ebe59bb2d2b44639c9ea9869757d4b58.tar.bz2 otp-46a89739ebe59bb2d2b44639c9ea9869757d4b58.zip | |
Merge branch 'maint'
* maint:
inets: Fix broken httpc options handling
Change-Id: I9e44f0e53237a390048cab3aaf52ea0e1a5358a2
Diffstat (limited to 'lib/inets/doc/src')
| -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 ffc6fec518..521ad6a015 100644 --- a/lib/inets/doc/src/httpc.xml +++ b/lib/inets/doc/src/httpc.xml @@ -441,17 +441,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> @@ -624,8 +629,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> |