diff options
author | Anders Svensson <[email protected]> | 2014-05-28 08:35:54 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2014-05-28 08:35:54 +0200 |
commit | 495b44babd659247f674ef88d50440e10891e138 (patch) | |
tree | 08752dd791cd94edaf71fd53dc42de9c8759f65c /lib/diameter/src/base | |
parent | 95ffa9b741631752633b3c97dfcd1ce620574e94 (diff) | |
parent | 631522514dbd409dbb789103b54bd81c879aff34 (diff) | |
download | otp-495b44babd659247f674ef88d50440e10891e138.tar.gz otp-495b44babd659247f674ef88d50440e10891e138.tar.bz2 otp-495b44babd659247f674ef88d50440e10891e138.zip |
Merge branch 'anders/diameter/hardening/OTP-11721' into maint
* anders/diameter/hardening/OTP-11721:
Change answer_errors default from report to discard
Diffstat (limited to 'lib/diameter/src/base')
-rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index f5ea459fd0..dd1c9b73bb 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -753,7 +753,7 @@ app_acc({application, Opts} = T, Acc) -> Alias = get_opt(alias, Opts, Dict), ModS = get_opt(state, Opts, Alias), M = get_opt(call_mutates_state, Opts, false, [true]), - A = get_opt(answer_errors, Opts, report, [callback, discard]), + A = get_opt(answer_errors, Opts, discard, [callback, report]), P = get_opt(request_errors, Opts, answer_3xxx, [answer, callback]), [#diameter_app{alias = Alias, dictionary = Dict, |