diff options
| author | Anders Svensson <[email protected]> | 2015-03-24 11:02:56 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-24 11:02:56 +0100 |
| commit | 1ea921c277e69b6b0ffd49335b85e7bf36936d2d (patch) | |
| tree | 31c582bcb62cdfa0a1fbf51b47741af4eb94b521 /lib/diameter/src/base/diameter_watchdog.erl | |
| parent | b7d8668ea5a4215da900bfcd2a1dbd51384cb0c7 (diff) | |
| parent | b8a7df45c9e57a832f7db9b9b875b31d0ab7d29c (diff) | |
| download | otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.tar.gz otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.tar.bz2 otp-1ea921c277e69b6b0ffd49335b85e7bf36936d2d.zip | |
Merge branch 'anders/diameter/DiameterURI/OTP-12589' into maint
* anders/diameter/DiameterURI/OTP-12589:
Adapt to changed DiameterURI defaults in RFC 6733
Reject transport=udp;protocol=diameter at DiameterURI encode
Diffstat (limited to 'lib/diameter/src/base/diameter_watchdog.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index fec6fb6107..de9c4bca33 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -126,11 +126,12 @@ i({Ack, T, Pid, {RecvData, random:seed(Seed), putr(restart, {T, Opts, Svc, SvcOpts}), %% save seeing it in trace putr(dwr, dwr(Caps)), %% - diameter_codec:setopts([{string_decode, false}]), {_,_} = Mask = proplists:get_value(sequence, SvcOpts), Restrict = proplists:get_value(restrict_connections, SvcOpts), Nodes = restrict_nodes(Restrict), Dict0 = common_dictionary(Apps), + diameter_codec:setopts([{common_dictionary, Dict0}, + {string_decode, false}]), #watchdog{parent = Pid, transport = start(T, Opts, SvcOpts, Nodes, Dict0, Svc), tw = proplists:get_value(watchdog_timer, |