diff options
| author | Anders Svensson <[email protected]> | 2015-03-24 11:03:03 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-24 11:03:03 +0100 |
| commit | 79b86a035adb0068e544401104d4c04db8e2b181 (patch) | |
| tree | 1c6688a39ac1ffe31774d3331538ac993bf68474 /lib/diameter/src/base/diameter_config.erl | |
| parent | 1ea921c277e69b6b0ffd49335b85e7bf36936d2d (diff) | |
| parent | e541c3d17c7b8295201cd7d72e876c1c67d0fc50 (diff) | |
| download | otp-79b86a035adb0068e544401104d4c04db8e2b181.tar.gz otp-79b86a035adb0068e544401104d4c04db8e2b181.tar.bz2 otp-79b86a035adb0068e544401104d4c04db8e2b181.zip | |
Merge branch 'anders/diameter/dpr/OTP-12609' into maint
* anders/diameter/dpr/OTP-12609:
Discard incoming/outgoing requests after incoming DPR
Add transport_opt() dpr_timeout
Be lenient with errors in incoming DPR
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index 05e9ab88fd..0d0304bf33 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -534,6 +534,7 @@ opt({capabilities, Os}) -> opt({K, Tmo}) when K == capx_timeout; + K == dpr_timeout; K == dpa_timeout -> ?IS_UINT32(Tmo); |