aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-09-11 15:56:31 +0200
committerIngela Anderton Andin <[email protected]>2014-02-05 10:32:24 +0100
commitb68cc1bd8995e53cec04a37be23bd1709e57bff9 (patch)
tree10dd96cffa40703817f3bd1a27eb3a3fa151ed57 /lib/inets/doc
parent8db1d1d3d38948dd118632b6617b8120299ab4b6 (diff)
downloadotp-b68cc1bd8995e53cec04a37be23bd1709e57bff9.tar.gz
otp-b68cc1bd8995e53cec04a37be23bd1709e57bff9.tar.bz2
otp-b68cc1bd8995e53cec04a37be23bd1709e57bff9.zip
inets: httpc make httpc_cancel_request/[1,2] asynchronous
Conflicts: lib/inets/src/http_client/httpc_handler.erl
Diffstat (limited to 'lib/inets/doc')
-rw-r--r--lib/inets/doc/src/httpc.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 91685db49f..b08c219603 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>2014</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>