diff options
| author | Anders Svensson <[email protected]> | 2013-09-09 13:57:26 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-09-09 13:57:26 +0200 |
| commit | 74a8ecf92551ff18c07e6fd5390de8a7f9e6d9f3 (patch) | |
| tree | 4e3db8349b35c36cf425c8b4c1333ba4d933087d /lib | |
| parent | a0b0b52e2bf62caacabb17dd242db09ea092ecc3 (diff) | |
| parent | ac54f126d0a8aa4e7f5a7cf2e445d18e77443e30 (diff) | |
| download | otp-74a8ecf92551ff18c07e6fd5390de8a7f9e6d9f3.tar.gz otp-74a8ecf92551ff18c07e6fd5390de8a7f9e6d9f3.tar.bz2 otp-74a8ecf92551ff18c07e6fd5390de8a7f9e6d9f3.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 5 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_peer_fsm.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_service.erl | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index fc5c284bf2..34b40c3a29 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -651,8 +651,9 @@ make_opts(Opts, Defs) -> [{K, opt(K,V)} || {K,V} <- Known]. -opt(spawn_opt, L) -> - is_list(L); +opt(spawn_opt, L) + when is_list(L) -> + L; opt(K, false = B) when K /= sequence -> diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl index 2b99ecc59c..282276827f 100644 --- a/lib/diameter/src/base/diameter_peer_fsm.erl +++ b/lib/diameter/src/base/diameter_peer_fsm.erl @@ -741,7 +741,7 @@ rejected(N, T, S) -> rejected({N, []}, T, S). failed_avp(RC, [{RC, Avp} | _]) -> - [{'Failed-AVP', [{'AVP', [Avp]}]}]; + [{'Failed-AVP', [[{'AVP', [Avp]}]]}]; failed_avp(RC, [_ | Es]) -> failed_avp(RC, Es); failed_avp(_, [] = No) -> diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl index 9dd8aafc61..47e03cd0a0 100644 --- a/lib/diameter/src/base/diameter_service.erl +++ b/lib/diameter/src/base/diameter_service.erl @@ -673,7 +673,8 @@ service_options(Opts) -> {use_shared_peers, get_value(use_shared_peers, Opts)}, {restrict_connections, proplists:get_value(restrict_connections, Opts, - ?RESTRICT)}]. + ?RESTRICT)}, + {spawn_opt, proplists:get_value(spawn_opt, Opts, [])}]. %% The order of options is significant since we match against the list. mref(false = No) -> |