From 21d62756235924bd56346fbdd6418f12b15a73e0 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 8 Sep 2017 17:34:26 +0200
Subject: Fix strict_arities blunder

The watchdog process retained the configuration, causing DWR/DWA encode
to fail on a string-valued Origin-Host/Realm if the encode arity was
relaxed.

Bungled in commit 5f3becad.
---
 lib/diameter/src/base/diameter_watchdog.erl | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index bb671e9860..f8e091c732 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -74,7 +74,6 @@
                      okay := non_neg_integer()},   %% REOPEN -> OKAY
          codec :: #{decode_format := false,
                     string_decode := false,
-                    strict_arities => diameter:strict_arities(),
                     strict_mbit := boolean(),
                     rfc := 3588 | 6733,
                     ordered_encode := false},
@@ -152,7 +151,6 @@ i({Ack, T, Pid, {Opts,
                                                  okay => 3},
                                         Opts)),
               codec = maps:with([decode_format,
-                                 strict_arities,
                                  strict_mbit,
                                  string_decode,
                                  rfc,
-- 
cgit v1.2.3


From 6deb68c76c6d1b0c6107a240ded20dbdeea2061d Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 8 Sep 2017 17:48:16 +0200
Subject: Fix type spec

Map key was not retained when the spec was added in commit 66bb5251.
---
 lib/diameter/src/base/diameter_peer_fsm.erl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 77ee3d6057..7a25cdfd45 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -130,7 +130,6 @@
                        %% diameter:call/4.
          codec :: #{decode_format := record,
                     string_decode := boolean(),
-                    strict_arities => diameter:strict_arities(),
                     strict_mbit := boolean(),
                     rfc := 3588 | 6733,
                     ordered_encode := false},
-- 
cgit v1.2.3