diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-10-14 13:50:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-10-14 13:50:32 +0200 |
| commit | db460f90313bb7adea4ebd4cf0f3cca568ddf118 (patch) | |
| tree | 04c9a60a9afa9a4d0dfadf96b152349ca00e94ad /lib/inets/doc/src | |
| parent | f13b2362c665ef2d98858a4601b1fecf31a21bb5 (diff) | |
| parent | cee5e8344470904f98579fae7046f49d65dbcb33 (diff) | |
| download | otp-db460f90313bb7adea4ebd4cf0f3cca568ddf118.tar.gz otp-db460f90313bb7adea4ebd4cf0f3cca568ddf118.tar.bz2 otp-db460f90313bb7adea4ebd4cf0f3cca568ddf118.zip | |
Merge branch 'ia/inets/http-client-cancel-request/OTP-11312' into maint
* ia/inets/http-client-cancel-request/OTP-11312:
inets: httpc - Remove dead error handling code
inets: httpc make httpc_cancel_request/[1,2] asynchronous
httpc: Enhanched error handling
inets: httpc improve pipelining
Diffstat (limited to 'lib/inets/doc/src')
| -rw-r--r-- | lib/inets/doc/src/httpc.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml index d9a27e7d1e..db68cc3116 100644 --- a/lib/inets/doc/src/httpc.xml +++ b/lib/inets/doc/src/httpc.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2004</year><year>2012</year> + <year>2004</year><year>2013</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -440,7 +440,10 @@ apply(Module, Function, [ReplyInfo | Args]) <v>Profile = profile() | pid() (when started <c>stand_alone</c>)</v> </type> <desc> - <p>Cancels an asynchronous HTTP-request. </p> + <p>Cancels an asynchronous HTTP-request. Note this does not guarantee + that the request response will not be delivered, as it is asynchronous the + the request may already have been completed when the cancellation arrives. + </p> <marker id="set_options"></marker> </desc> |