aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-08-26 15:53:51 +0200
committerLukas Larsson <[email protected]>2016-08-26 15:53:51 +0200
commit85234b4069c9b75e3ae5ddf643b981d7428fb81f (patch)
treeaa52443a80eecf23664cf56ed74cb395cab5a96c /erts/doc/src
parentd017ade88b8fa39f57aee722dd2e2c5d82e8b262 (diff)
parent6fe89e38d40132e6acac2233d45ea44da49d1021 (diff)
downloadotp-85234b4069c9b75e3ae5ddf643b981d7428fb81f.tar.gz
otp-85234b4069c9b75e3ae5ddf643b981d7428fb81f.tar.bz2
otp-85234b4069c9b75e3ae5ddf643b981d7428fb81f.zip
Merge branch 'g-andrade/kernel/fetch_ztream_dictionary/PR-1139/OTP-13842'
* g-andrade/kernel/fetch_ztream_dictionary/PR-1139/OTP-13842: Update preloaded modules Specify min zlib ver on inflateGetDictionary doc Skip inflateGetDictionary test case if unsupported zlib: Only link inflateGetDictionary if available zlib: Add test case for inflateGetDictionary zlib: support extraction of inflation dictionary
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/zlib.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index 138414a880..e1924fffee 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -576,6 +576,18 @@ unpack(Z, Compressed, Dict) ->
</func>
<func>
+ <name name="inflateGetDictionary" arity="1"/>
+ <fsummary>Return the decompression dictionary.</fsummary>
+ <desc>
+ <p>Returns the decompression dictionary currently in use
+ by the stream. This function must be called between
+ <seealso marker="#inflateInit/1"><c>inflateInit/1,2</c></seealso>
+ and <seealso marker="#inflateEnd/1"><c>inflateEnd</c></seealso>.</p>
+ <p>Only supported if ERTS was compiled with zlib >= 1.2.8.</p>
+ </desc>
+ </func>
+
+ <func>
<name name="open" arity="0"/>
<fsummary>Open a stream and return a stream reference.</fsummary>
<desc>