diff options
| author | Micael Karlberg <[email protected]> | 2012-06-14 12:51:57 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-06-14 12:51:57 +0200 |
| commit | 06aebf59590d2376ac54f534f58b0ea9f41efb25 (patch) | |
| tree | a0b604d584ea30a720deba59e22c5ddf9801bd14 | |
| parent | 67d2e30e77db74d0852421c21362d1a9374780e1 (diff) | |
| parent | 1bc041bd68040220081e8af275701f92f4a07aae (diff) | |
| download | otp-06aebf59590d2376ac54f534f58b0ea9f41efb25.tar.gz otp-06aebf59590d2376ac54f534f58b0ea9f41efb25.tar.bz2 otp-06aebf59590d2376ac54f534f58b0ea9f41efb25.zip | |
Merge branch 'ja/jl-httpc-doc-elaborate' into bmk/inets/httpc-doc-elaborate/OTP-10114
| -rw-r--r-- | lib/inets/doc/src/httpc.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml index 70c845bade..f032ac96e1 100644 --- a/lib/inets/doc/src/httpc.xml +++ b/lib/inets/doc/src/httpc.xml @@ -488,7 +488,7 @@ apply(Module, Function, [ReplyInfo | Args]) <v>KeepAliveTimeout = integer() </v> <d>Default is <c>120000</c> (= 2 min). If a persistent connection is idle longer than the - <c>keep_alive_timeout</c> the client will close the connection. + <c>keep_alive_timeout</c> in milliseconds, the client will close the connection. The server may also have such a time out but you should not count on it!</d> <v>MaxPipeline = integer() </v> @@ -498,7 +498,7 @@ apply(Module, Function, [ReplyInfo | Args]) <d>Default is <c>0</c>, which will result in pipelining not being used. If a persistent connection is idle longer than the - <c>pipeline_timeout</c> the client will close the connection. </d> + <c>pipeline_timeout</c> in milliseconds the client will close the connection. </d> <v>CookieMode = enabled | disabled | verify </v> <d>Default is <c>disabled</c>. If Cookies are enabled all valid cookies will automatically be |