aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter_codec.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-09-14 23:42:07 +0200
committerAnders Svensson <[email protected]>2015-09-14 23:42:07 +0200
commit195393b00e0a5b83526a2bca504fe32edd6dc989 (patch)
tree9566ebd4d4ce7edbb69593b9a460d1e2362c8ddf /lib/diameter/src/base/diameter_codec.erl
parentf4534cb9841c4ec9d6c7048555ed1ba5169b966f (diff)
parent0d2bebf94d99b2d3bd39c5731ac81122f3ea7fb7 (diff)
downloadotp-195393b00e0a5b83526a2bca504fe32edd6dc989.tar.gz
otp-195393b00e0a5b83526a2bca504fe32edd6dc989.tar.bz2
otp-195393b00e0a5b83526a2bca504fe32edd6dc989.zip
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_codec.erl')
-rw-r--r--lib/diameter/src/base/diameter_codec.erl10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index bcdc5b3005..1ea5357924 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -77,9 +77,10 @@ setopts(Opts)
when is_list(Opts) ->
lists:foreach(fun setopt/1, Opts).
-%% Decode stringish types to string()? The default true is for
-%% backwards compatibility.
-setopt({string_decode = K, false = B}) ->
+%% The default string_decode true is for backwards compatibility.
+setopt({K, false = B})
+ when K == string_decode;
+ K == strict_mbit ->
setopt(K, B);
%% Regard anything but the generated RFC 3588 dictionary as modern.
@@ -97,7 +98,8 @@ setopt(Key, Value) ->
getopt(Key) ->
case get({diameter, Key}) of
- undefined when Key == string_decode ->
+ undefined when Key == string_decode;
+ Key == strict_mbit ->
true;
undefined when Key == rfc ->
6733;