aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-28Merge branch 'dev' into majorBjörn Gustavsson
* dev: distribution_SUITE:bulk_send_bigbig/1: Fail with more information distribution_SUITE: Use unique slave node names beam_lib: Handle rare race in the crypto key server functionality busy_port_SUITE: Avoid crash in register/2 [wx] Re-generate code [wx] Remove optional shadowing clauses [wx] Remove warning [wx] Fix trailing whitespace [wx] Test colors in textctrl [wx] Fix cleanup memory references
2011-09-28Merge branch 'bjorn/stdlib/fix-beam_lib-race/OTP-9586' into devBjörn Gustavsson
* bjorn/stdlib/fix-beam_lib-race/OTP-9586: beam_lib: Handle rare race in the crypto key server functionality
2011-09-28Merge branch 'bjorn/fix-test-cases' into devBjörn Gustavsson
* bjorn/fix-test-cases: distribution_SUITE:bulk_send_bigbig/1: Fail with more information distribution_SUITE: Use unique slave node names busy_port_SUITE: Avoid crash in register/2
2011-09-28Merge branch 'dgud/wx/wx-bugs' into devDan Gudmundsson
* dgud/wx/wx-bugs: [wx] Re-generate code [wx] Remove optional shadowing clauses [wx] Remove warning [wx] Fix trailing whitespace [wx] Test colors in textctrl [wx] Fix cleanup memory references
2011-09-28Merge branch 'dev' into majorAnders Svensson
2011-09-28Merge branch 'anders/diameter/release-0.10' into devAnders Svensson
* anders/diameter/release-0.10: Fix make dependency blunder
2011-09-28Merge branch 'dev' into majorIngela Anderton Andin
2011-09-28Merge branch 'ia/ssl/doc-fix' into devIngela Anderton Andin
* ia/ssl/doc-fix: Corrected documentation bug
2011-09-28Fix make dependency blunderAnders Svensson
Missed the dependency of dictionary beams on diameter_exprecs when removing compiler modules from app file. The changed build order then caused the build to fail.
2011-09-28Corrected documentation bugIngela Anderton Andin
2011-09-28Merge remote branch 'upstream/dev' into majorIngela Anderton Andin
* upstream/dev: Both the SSLv3 and TLS 1.0/TLS 1.1 specifications require implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them. fix unknown ssl extension parsing by changing length from bits to bytes Temporary disable tests on MAC due to issus with the MAC ODBC drivers
2011-09-28Merge branch 'ia/odbc/temp-disable-mac-tests' into devIngela Anderton Andin
* ia/odbc/temp-disable-mac-tests: Temporary disable tests on MAC due to issus with the MAC ODBC drivers
2011-09-28Merge branch 'fix_unknown_ssl_extension_parsing' into devIngela Anderton Andin
* fix_unknown_ssl_extension_parsing: Both the SSLv3 and TLS 1.0/TLS 1.1 specifications require implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them. fix unknown ssl extension parsing by changing length from bits to bytes
2011-09-28Merge branch 'dev' into majorHans Bolinder
* dev: Improve indentation in manpages
2011-09-28Merge branch 'hb/erl_docgen/man_indentation_fix/OTP-9588' into devHans Bolinder
* hb/erl_docgen/man_indentation_fix/OTP-9588: Improve indentation in manpages
2011-09-28Improve indentation in manpagesHans Bolinder
The indentation after `Warning:' and `Note:' in manpages has been improved.
2011-09-27Merge branch 'dev' into majorAnders Svensson
Conflicts: lib/diameter/src/app/Makefile
2011-09-27Merge branch 'anders/diameter/release-0.10' into devAnders Svensson
* anders/diameter/release-0.10: Example/dbg/comment fixes Don't include compiler/help modules in app Set version to 0.10 and update appup
2011-09-27Example/dbg/comment fixesAnders Svensson
2011-09-27Don't include compiler/help modules in appAnders Svensson
2011-09-27Merge branch 'maint-r14' into devSverker Eriksson
Fake merge.
2011-09-27Both the SSLv3 and TLS 1.0/TLS 1.1 specifications requireIngela Anderton Andin
implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them. Data not following the protocol format for extensions will be ignored by the last dec_hello_extensions-clause. OTP-8596
2011-09-27Set version to 0.10 and update appupAnders Svensson
2011-09-27Merge branch 'dev' into majorAnders Svensson
2011-09-27Merge branch 'anders/diameter/testsuites/OTP-9553' into devAnders Svensson
* anders/diameter/testsuites/OTP-9553: (23 commits) Explicit {init,end}_per_group/2 to work around ct bug Add relay suite More traffic cases Add traffic suite Use groups for parallel testcase execution Remove gen_sctp suite since it's not diameter-specific Minor macro cleanup Minor diameter_ct simplification Improve xref testcase Don't require GNU sed to fail testsuite targets Generate dependencies makefile Makefile/spec cleanup Remove old test framework Add transport and gen_sctp suites Add watchdog suite Add stats suite Add sync suite Add reg suite Add dict suite, remove session suite Move appup tests into app suite and use systools for both ...
2011-09-27Merge branch 'anders/diameter/send_anything/OTP-9581' into devAnders Svensson
* anders/diameter/send_anything/OTP-9581: Fix sending of messages of arbitrary form
2011-09-27Merge branch 'anders/diameter/relay_behaviour/OTP-9583' into devAnders Svensson
* anders/diameter/relay_behaviour/OTP-9583: Fix and clarify relay behaviour
2011-09-27Merge branch 'anders/diameter/peer_filters/OTP-9580' into devAnders Svensson
* anders/diameter/peer_filters/OTP-9580: Fix and clarify semantics of peer filters
2011-09-27Merge branch 'anders/diameter/logging/OTP-9579' into devAnders Svensson
* anders/diameter/logging/OTP-9579: Makefile dependency fix Remove duplicate info from error report at encode failure Use single format for error_logger reports Fix improper use of error_logger:info_report/2
2011-09-27Merge branch 'anders/diameter/header_folding_error/OTP-9577' into devAnders Svensson
* anders/diameter/header_folding_error/OTP-9577: Fix header folding bug
2011-09-27Merge branch 'anders/diameter/documentation/OTP-9582' into devAnders Svensson
* anders/diameter/documentation/OTP-9582: Minor documentation fixes
2011-09-27Merge branch 'anders/diameter/answer-message_errors/OTP-9578' into devAnders Svensson
* anders/diameter/answer-message_errors/OTP-9578: Fix bugs in sending of answer-message replies
2011-09-27distribution_SUITE:bulk_send_bigbig/1: Fail with more informationBjörn Gustavsson
2011-09-27distribution_SUITE: Use unique slave node namesBjörn Gustavsson
bad_dist_ext_connection_id/1 used the same names for the slave nodes as bad_dist_ext_receive/1, which would cause it to fail if bad_dist_ext_receive/1 failed.
2011-09-27Explicit {init,end}_per_group/2 to work around ct bugAnders Svensson
Without these functions the result pages are currently mangled. The overview page shows that no suites have run, even though all in fact are, and diameter-specific page is truncated after the dict suite, which is the first suite that relied on an implicit {init,end}_per_group/2. This is apparently the result of a recent common_test commit.
2011-09-27Add relay suiteAnders Svensson
2011-09-27beam_lib: Handle rare race in the crypto key server functionalityBjörn Gustavsson
In rare circumstances, there can be a race when the crypto key server is started by beam_lib:crypto_key_fun/1 shortly after stopping it using beam_lib:clear_crypto_key_fun/0. The race occurs because the crypto key server first sends back the reply to the calling process, then terminates. (The race is probably more likely to happen on CPUs with hyper threading.)
2011-09-27Merge branch 'dev' into majorHans Bolinder
* dev: Improve the generation of man pages Correct XML files
2011-09-27Merge branch 'hb/doc_corrections/OTP-9550' into devHans Bolinder
* hb/doc_corrections/OTP-9550: Correct XML files
2011-09-27Merge branch 'hb/erl_docgen/man_improvements/OTP-9541' into devHans Bolinder
* hb/erl_docgen/man_improvements/OTP-9541: Improve the generation of man pages
2011-09-27Merge branch 'dev' into majorBjörn Gustavsson
* dev: Update preloaded modules erl_prim_loader: Eliminate dialyzer warning Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2011-09-27fix unknown ssl extension parsing by changing length from bits to bytesBen Murphy
2011-09-26Fix bugs in sending of answer-message repliesAnders Svensson
3001 (DIAMETER_COMMAND_UNSUPPORTED) was not sent since the decode placed the AVP list in the errors field rather than the avps field of the diameter_packet, causing the subsequent encode to fail. Session-Id was also set improperly, causing encode to fail even in this case.
2011-09-26Fix and clarify relay behaviourAnders Svensson
Leave it up to a handle_request callback to decide whether or not to filter the peer from which the incoming request was sent. Reply with 3002 (DIAMETER_UNABLE_TO_DELIVER) on anything but an answer from the peer.
2011-09-26Makefile dependency fixAnders Svensson
Dependency of generated dictionary modules on diameter.hrl and diameter_gen.hrl was missed.
2011-09-26Remove duplicate info from error report at encode failureAnders Svensson
The message being encoded and dictionary module are included by diameter_codec.erl so diameter_gen.hrl doing so was overkill.
2011-09-26Use single format for error_logger reportsAnders Svensson
2011-09-26Prepare releaseErlang/OTP
2011-09-26Merge branch 'sverker/remove-static-ssl-linking/OTP-9566' into maint-r14Erlang/OTP
* sverker/remove-static-ssl-linking/OTP-9566: crypto: touch Makefile to provoke patch release Change static link test of ssl to dynamic Remove static ssl linking in crypto for otp_build
2011-09-26More traffic casesAnders Svensson