diff options
| author | Anders Svensson <[email protected]> | 2015-03-23 14:04:39 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-23 14:04:39 +0100 |
| commit | 487446e76102b27fa8df02a353c7fdeec2d091f1 (patch) | |
| tree | 19dce38759ffdf13a8686ce2b11c7fe190abf0f3 /lib/diameter/src/base/diameter_config.erl | |
| parent | d9eb16007cab3238ea2f6667cdc7731b0aa50edc (diff) | |
| parent | 7d05e55951b4f3fc4af0febb965d3075e5ddf324 (diff) | |
| download | otp-487446e76102b27fa8df02a353c7fdeec2d091f1.tar.gz otp-487446e76102b27fa8df02a353c7fdeec2d091f1.tar.bz2 otp-487446e76102b27fa8df02a353c7fdeec2d091f1.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index c0a4f7df69..aa4d6e5a20 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -532,7 +532,9 @@ opt({applications, As}) -> opt({capabilities, Os}) -> is_list(Os) andalso ok == encode_CER(Os); -opt({capx_timeout, Tmo}) -> +opt({K, Tmo}) + when K == capx_timeout; + K == dpa_timeout -> ?IS_UINT32(Tmo); opt({length_errors, T}) -> |