aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-05Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_cipher.erl lib/ssl/test/ssl_basic_SUITE.erl
2015-03-05Merge branch 'ia/ssl/TLS_FALLBACK_SCSV/OTP-12458' into maintIngela Anderton Andin
* ia/ssl/TLS_FALLBACK_SCSV/OTP-12458: ssl: Implement support for TLS_FALLBACK_SCSV
2015-03-05Merge branch 'maint'Anders Svensson
2015-03-05Merge branch 'anders/diameter/17/time/OTP-12439' into maintAnders Svensson
* anders/diameter/17/time/OTP-12439: Ignore undefined calls to OTP 18 time api in app suite
2015-03-05Merge branch 'anders/diameter/time/OTP-12439' into maintAnders Svensson
* anders/diameter/time/OTP-12439: Use new time api in test suites Use new time api in implementation
2015-03-05Merge branch 'anders/diameter/pool/OTP-12428' into maintAnders Svensson
* anders/diameter/pool/OTP-12428: Fix SCTP match blunder in suites Be backwards compatible with diameter_sctp listener state Add gen_tcp testcase that fails sporadically Simplify transport suite Remove (ancient) dead code Don't orphan slave nodes in example suite Refresh example code Improve language consistency in diameter(1) Add pool suite to test transport_opt() pool_size Adapt tcp/sctp transport modules for pool_size > 1 Add transport_opt() pool_size
2015-03-05Merge branch 'maint'Anders Svensson
2015-03-05Merge branch 'anders/diameter/shutdown/OTP-12412' into maintAnders Svensson
* anders/diameter/shutdown/OTP-12412: Increase service shutdown timeout Set shutdown = infinity for supervisor children Monitor more efficiently at shutdown
2015-03-05Merge branch 'anders/diameter/retransmission/OTP-12415' into maintAnders Svensson
* anders/diameter/retransmission/OTP-12415: Fix retransmission of messages sent as header/avps list
2015-03-05Merge branch 'anders/diameter/answer_discard/OTP-11492' into maintAnders Svensson
* anders/diameter/answer_discard/OTP-11492: Fix error matching in traffic suite Don't discard outgoing answers with Result-Code/E-bit errors
2015-03-02Merge branch 'maint'Raimo Niskanen
2015-03-02Merge branch 'raimo/inet_tcp_dist-priority-option/OTP-12476' into maintRaimo Niskanen
* raimo/inet_tcp_dist-priority-option/OTP-12476: Document kernel inet_dist_{listen,connect}_options Test kernel inet_dist_{listen,connect}_options Implement kernel inet_dist_{listen,connect}_options
2015-03-02ssl: Implement support for TLS_FALLBACK_SCSVIngela Anderton Andin
2015-03-01Ignore undefined calls to OTP 18 time api in app suiteAnders Svensson
So that the xref testcase is independent of the release it's run on. The code uses the new time api if available, so as to be forward compatible.
2015-02-27Merge branch 'maint'Zandra Hird
2015-02-27Merge branch 'rokob/eliminate-duplication-app-controller' into maintZandra Hird
* rokob/eliminate-duplication-app-controller: Add helper function to reduce code duplication OTP-12524
2015-02-27Merge branch 'maint'Henrik Nord
2015-02-27Merge branch 'nox/docs-re-unicode' into maintHenrik Nord
* nox/docs-re-unicode: Fix documentation about character types in unicode mode OTP-12521
2015-02-27Merge branch 'maint'Henrik Nord
2015-02-27Merge branch 'kellymclaughlin/crypto-aes-cfb-flexible-key-size/OTP-12467' ↵Henrik Nord
into maint * kellymclaughlin/crypto-aes-cfb-flexible-key-size/OTP-12467: Accept all valid key sizes in aes_cfb functions
2015-02-27Merge branch 'bjorn/cover'Björn Gustavsson
* bjorn/cover: test_server: Sort cover-analysed modules cover: Optimize file operations
2015-02-27Merge branch 'maint'Björn Gustavsson
* maint: Ensure dbg tracer exits when dbg is stopped
2015-02-27Merge branch 'fishcakez/runtime_tools/dbg/OTP-12517' into maintBjörn Gustavsson
* fishcakez/runtime_tools/dbg/OTP-12517: Ensure dbg tracer exits when dbg is stopped
2015-02-26Merge branch 'maint'Peter Andersson
2015-02-26Merge branch 'peppe/common_test/missing_start_flag_in_doc' into maintPeter Andersson
* peppe/common_test/missing_start_flag_in_doc: Add missing -group flag in ct_run help text OTP-12433
2015-02-26Ensure dbg tracer exits when dbg is stoppedJames Fish
Previously the tracer might receive an 'EXIT' message in the trace receive loop and treat it as garbage. Test uses a custom dbg process handler to reliably recreate the race condition, i.e. the message order {trace, ..}, {'EXIT, ..}.
2015-02-25Fix error matching in traffic suiteAnders Svensson
Clause matching error for specific test cases was harmless since the subsequent clause also matched. Errors detected by the server result in Failed-AVP being sent, which should not lead to a decode error in the client.
2015-02-25Don't discard outgoing answers with Result-Code/E-bit errorsAnders Svensson
Outgoing answers missing a Result-Code AVP or setting an E-bit inappropriately were discarded, but there's no particular reason for doing so if the answer can be encoded, and the sender has no way of knowing that their answer has been discarded. It's also inappropriate that the message be discarded in the relay case. Answers are now sent, and an error counter incremented.
2015-02-25Merge branch 'sverk/crypto-aes_ecb_crypt-dialyzer-fix'Sverker Eriksson
* sverk/crypto-aes_ecb_crypt-dialyzer-fix: crypto: Fix dialyzer error for aes_ecb_crypt/3
2015-02-25test_server: Sort cover-analysed modulesBjörn Gustavsson
'cover' has changed so that the analyzed results are returned in random order, which is annyoying. Sort the list so that modules appear in alphabetical order.
2015-02-25cover: Optimize file operationsBjörn Gustavsson
Use the 'raw', 'delayed_write', and 'read_head' options to speed up file operations. The analysis at the end of: ts:run(compiler, [batch,cover]). is now roughly twice as fast.
2015-02-25Update primary bootstrapBjörn Gustavsson
2015-02-25Merge branch 'nox/stdlib/erl_lint-maps/OTP-12515'Björn Gustavsson
* nox/stdlib/erl_lint-maps/OTP-12515: Properly lint map expressions in erl_lint
2015-02-25Merge branch 'nox/stdlib/erl_lint-expr_list'Björn Gustavsson
* nox/stdlib/erl_lint-expr_list: Remove a few superfluous vt operations in erl_lint
2015-02-24Merge branch 'maint'Zandra Hird
2015-02-24Merge branch 'zandra/xcomp-power-pc-dso-linux-fix' into maintZandra Hird
* zandra/xcomp-power-pc-dso-linux-fix: update ppc xcomp file
2015-02-24Merge branch 'maint'Zandra Hird
2015-02-24Merge branch 'nifoc/inet_doc_fixes' into maintZandra Hird
* nifoc/inet_doc_fixes: Fix typos ("received to the socket")
2015-02-24Fix SCTP match blunder in suitesAnders Svensson
More than an incoming message can contain ancillary data, which the gen_sctp and transport suites did not expect. On FreeBSD 10, an sctp_assoc_change event appears always to contain ancillary data.
2015-02-23Merge branch 'richcarl/syntax_tools-remove-mnemosyne'Zandra Hird
* richcarl/syntax_tools-remove-mnemosyne: Remove Mnemosyne rules support from EDoc Remove support for Mnemosyne rules Remove support for mnemosyne-style record field access OTP-12511
2015-02-23update ppc xcomp fileZandra Hird
2015-02-23Merge branch 'mikpe/remove-perfctr-support'Zandra Hird
* mikpe/remove-perfctr-support: remove perfctr support OTP-12508
2015-02-23Merge branch 'maint'Peter Andersson
2015-02-23Merge remote-tracking branch ↵Peter Andersson
'origin/peppe/common_test/include_file_problems' into maint * origin/peppe/common_test/include_file_problems: Fix failing test case Add valid include path to epp in erl2html2 and fix crashing code OTP-12419
2015-02-23Update primary bootstrapBjörn Gustavsson
2015-02-23Merge branch 'bjorn/compiler/beam_jump-share'Björn Gustavsson
* bjorn/compiler/beam_jump-share: beam_jump: Don't jump into the middle of a 'try'
2015-02-23Merge branch 'bjorn/compiler/sys_core_fold'Björn Gustavsson
* bjorn/compiler/sys_core_fold: sys_core_fold: Fix non-tail-recursive list comprehensions
2015-02-23Merge branch 'josevalim/stdlib/dict'Björn Gustavsson
* josevalim/stdlib/dict: Short-circuit common dict operations
2015-02-22Remove a few superfluous vt operations in erl_lintAnthony Ramine
Given any Vt1 and Vt2 values, vtmerge(vtnew(Vt1, Vt2), vtold(Vt1, Vt2)) is always equal to Vt1.
2015-02-20Merge branch 'siri/cover-perf/OTP-12330'Siri Hansen
* siri/cover-perf/OTP-12330: [test_server] Use new, more efficient functions in cover [cover] Improve performance