aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-04 14:52:29 +0100
committerMicael Karlberg <[email protected]>2011-03-04 14:52:29 +0100
commit546d0fd69519682e92b6493b6d092e4591ae5010 (patch)
treecbaf90442128f008e6a4636d220400ac57d613eb /lib/inets/doc/src
parent840026b8a94e7575e07ba6da2d74be22cf9d8bdf (diff)
parent6951ed1075b8c36d5b6f51e5e5df7bd14602c1d8 (diff)
downloadotp-546d0fd69519682e92b6493b6d092e4591ae5010.tar.gz
otp-546d0fd69519682e92b6493b6d092e4591ae5010.tar.bz2
otp-546d0fd69519682e92b6493b6d092e4591ae5010.zip
Merge branch 'fm/httpc-upload-body-streaming' into bmk/inets/httpc/support_upload_body_streaming/OTP-OTP-9094
Conflicts: lib/inets/src/http_client/httpc.erl lib/inets/test/httpc_SUITE.erl
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/httpc.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index bcdd2913e0..6dcf2d6d17 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -89,7 +89,11 @@ headers() = [header()]
header() = {field(), value()}
field() = string()
value() = string()
-body() = string() | binary()
+body() = string() | binary() |
+ {fun(acc()) -> send_fun_result(), acc()} |
+ {chunkify, fun(acc()) -> send_fun_result(), acc()}
+send_fun_result() = eof | {ok, iolist(), acc()}
+acc() = term()
filename() = string()
]]></code>