aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-12-02ssl: Refactor connection and handshake handlingIngela Anderton Andin
2013-12-02ssl: Refactor handshake and record handlingIngela Anderton Andin
2013-11-29Merge branch 'sverk/bit-cmp-bug/OTP-11501' into maintSverker Eriksson
* sverk/bit-cmp-bug/OTP-11501: erts: Fix invalid read when appending binaries during call trace erts: Optimize comparison for bitstrings with byte aligned start erts: Fix invalid read in bitstring comparison
2013-11-29Merge branch 'anders/diameter/capx_dictionary/OTP-11361' into maintAnders Svensson
* anders/diameter/capx_dictionary/OTP-11361: Don't hardcode diameter_base @prefix on common dictionary
2013-11-29Merge branch 'richcarl/fix-sasl-handler-docs' into maintHenrik Nord
* richcarl/fix-sasl-handler-docs: Fix confusing documentation about error handlers in SASL OTP-11507
2013-11-29Merge branch 'nox/igor-funs' into maintHenrik Nord
* nox/igor-funs: Remove a useless function clause in erl_syntax_lib Fix transformation of implicit funs in igor Fix reverting of implicit funs OTP-11506
2013-11-29Merge branch 'bsmr-erlang/fix_wx_typos' into maintHenrik Nord
* bsmr-erlang/fix_wx_typos: fix documentation OTP-11505
2013-11-29Merge branch 'siri/ct_netconfc/close_session-timeout-hangs/OTP-11478' into maintSiri Hansen
* siri/ct_netconfc/close_session-timeout-hangs/OTP-11478: [common_test] Don't hang netconf client when close-session times out
2013-11-29Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [observer] Fix copy/paste error in observer_SUITE:app_file/1 [common_test] Minor corrections in test of ct_netconfc
2013-11-29Merge branch 'dgud/mnesia/sticky-race/OTP-11375' into maintDan Gudmundsson
* dgud/mnesia/sticky-race/OTP-11375: mnesia: Synchronize lock cleanup after mnesia down
2013-11-29Merge branch 'dgud/sasl/no_dot_erlang_boot/OTP-8479' into maintDan Gudmundsson
* dgud/sasl/no_dot_erlang_boot/OTP-8479: sasl: Add no_dot_erlang documentation and tests sasl: Add no_dot_erlang start script
2013-11-28Merge remote branch 'origin/peppe/common_test/change_skip_behaviour' into maintPeter Andersson
* origin/peppe/common_test/change_skip_behaviour: Modify the auto_skip report for group config funcs to include group name Fix problems with info functions and add more tests Add test cases for new and modified functionality Fix problem with suites and groups skipped from test specification Change report tag for failed init_per_testcase from skipped to auto_skipped Add tests for skipping parallel groups Correct tests cases that fail because of modified events Correct various bugs related to auto_skip and groups Change status from skip to auto_skip for config func that fails due to require Fix problem with handling Config and FW reports correctly Change skip vs auto_skip behaviour OTP-11305
2013-11-28Don't hardcode diameter_base @prefix on common dictionaryAnders Svensson
2013-11-28Merge branch 'rickard/prim_inet_close/OTP-11491' into maintRickard Green
* rickard/prim_inet_close/OTP-11491: Fix prim_inet:close/1
2013-11-28Merge branch 'rickard/port_bifs_fix/OTP-11489' into maintRickard Green
* rickard/port_bifs_fix/OTP-11489: Ensure exit signal due to link precede port BIF return
2013-11-28Revert "Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maint"Lukas Larsson
This reverts commit 1562340596938d1f8a84b2ed43f5f0097be66ae7, reversing changes made to a5128108ad3efff77c5080f0769737e70a0bfd82.
2013-11-28Merge branch 'lukas/erts/supercarrier_fix/OTP-11149' into maintLukas Larsson
* lukas/erts/supercarrier_fix/OTP-11149: Improve error info when main carrier creation fails Conflicts: erts/emulator/test/alloc_SUITE.erl
2013-11-27Merge branch 'sverk/crypto-no_answer_from_tc_supervisor' into maintSverker Eriksson
* sverk/crypto-no_answer_from_tc_supervisor: crypto: Avoid test_server crash 'no_answer_from_tc_supervisor'
2013-11-27Merge branch 'sverk/bin2term-bitstr-bugs/OTP-11479' into maintSverker Eriksson
* sverk/bin2term-bitstr-bugs/OTP-11479: erts: Fix bug in binary_to_term for binaries larger than 2^31 erts: Fix bugs in binary_to_term for invalid bitstrings
2013-11-27Merge branch 'sverk/allctr-4byte-align-bug' into maintSverker Eriksson
* sverk/allctr-4byte-align-bug: erts: Fix alignment bug in allocator start code OTP-11496
2013-11-27erts: Fix invalid read when appending binaries during call traceSverker Eriksson
Found by valgrind. Probably safe on opt-VM due to CHICKEN_PAD.
2013-11-27Merge branch 'sverk/zlib_SUITE-large_deflate-fix' into maintSverker Eriksson
* sverk/zlib_SUITE-large_deflate-fix: kernel: Fix zlib_SUITE:large_deflate
2013-11-27Merge branch 'ia/ssh/no_io/OTP-11490' into maintIngela Anderton Andin
* ia/ssh/no_io/OTP-11490: ssh: Correct arity in ssh_no_io.erl
2013-11-27Merge branch 'ia/ssh/close/OTP-11363' into maintIngela Anderton Andin
* ia/ssh/close/OTP-11363: ssh: Correct close handling
2013-11-26erts: Optimize comparison for bitstrings with byte aligned startSverker Eriksson
2013-11-26erts: Fix invalid read in bitstring comparisonSverker Eriksson
Valgrind complained that erts_cmp_bits sometimes read one byte too much from bitstrings. The byte was never used and the invalid read is safe in opt-VM due to padding in binary allocation (CHICKED_PAD).
2013-11-26[observer] Fix copy/paste error in observer_SUITE:app_file/1Siri Hansen
2013-11-26Merge branch 'bmk/snmp/snmp425_integration' into maintMicael Karlberg
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/src/misc/snmp_log.erl lib/snmp/vsn.mk
2013-11-26kernel: Fix zlib_SUITE:large_deflateSverker Eriksson
Commontest doesn't like arity 0 function with same name as test case.
2013-11-26Fix prim_inet:close/1Rickard Green
2013-11-26Ensure exit signal due to link precede port BIF returnRickard Green
2013-11-26ssh: Correct close handlingIngela Anderton Andin
Commit 68263a48bfbdac4dc219a91f06af3d535d881850 got close handling slightly wrong, channels did not get their close message. Commit 32102f1e8225dada7526c9bfee6622f9026ba4cd did not work as expected
2013-11-26Merge branch 'maint-r16' into maintRaimo Niskanen
2013-11-25Merge branch 'raimo/sctp-peernames/OTP-10229' into maint-r16Raimo Niskanen
* raimo/sctp-peernames/OTP-10229: Improve documentation Suppress false valgrind warnings caused by sctp_getpaddrs Document Adjust test cases for SLES 10 SP 1 Clean up address family handling towards Erlang Fix testcase indentation Fix testcases for FreeBSD 9.1 Write testcases for inet:socknames and inet:peernames Implement inet:socknames/1,2 and inet:peernames/1,2 Implement prim_inet:socknames/1,2 and prim_inet:peernames/1,2
2013-11-25mnesia: Synchronize lock cleanup after mnesia downDan Gudmundsson
Bad timing could lead to hanging transactions after a mnesia down from a node with sticky locks. Excellent bug report from janchochol Situation: * node A and B have copies of table T * node A ows sticky of table T * node A goes down (e.g. crash) * node B tries to perform transactional operation on table T (e.g. mnesia:select) In this situation there is possibility that first (and maybe other) transaction on node B will hang indefinitely. This is caused by race condition, when transaction process send lock request operation to node A and waits for reply. When node A is down it will never send reply, so process on node B will be stuck forever. Reason is that message sent to mnesia_locker gen_server from mnesia_locker:mnesia_down can be received after mnesia_locker gen_server already replies to transaction processes with {switch, N, Req} and node N is down. Monitoring remote process when sending request to other node should be safe solution.
2013-11-25Improve documentationRaimo Niskanen
2013-11-25ssh: Correct arity in ssh_no_io.erlIngela Anderton Andin
Also remove import statement as it makes code less intuitive
2013-11-25Improve error info when main carrier creation failsLukas Larsson
Also fix testcase that failed due to main carrier creation failure.
2013-11-25Merge branch 'rickard/acul-bug/OTP-11456' into maintRickard Green
* rickard/acul-bug/OTP-11456: Ensure carrier pool only accessed by schedulers
2013-11-25Merge branch 'rickard/supercarrier-fix/OTP-11149' into maintRickard Green
* rickard/supercarrier-fix/OTP-11149: Fix observer retrieval of alloc info Fix documentation of the +MMsco switch Replace the +MMscmgc switch with +MMscrfsd Add switch for disabling sys_alloc carriers Add support for locking mappings to physical memory
2013-11-22Merge branch 'maint-r15' into maint-r16Micael Karlberg
2013-11-22crypto: Avoid test_server crash 'no_answer_from_tc_supervisor'Sverker Eriksson
2013-11-22Rename otp_8949_a/0 which common_test interprets as an info functionBjörn Gustavsson
Before running a test case named testcase/1, common_test will call testcase/0 (the info function). Exceptions and illegal return values would be silently ignored. In a planned update to common_test, errors will instead cause the test case to fail. The test case otp_8949_a/1 has a helper function called otp_8949_a/0. Rename it to do_otp_8949_a/0. While at it, also fix a copy and paste bug in the list of test cases. otp_8949_a was run twice; otp_8949_b was never run.
2013-11-22[common_test] Minor corrections in test of ct_netconfcSiri Hansen
2013-11-21Merge branch 'bmk/snmp/snmp4223_integration' into maint-r15Erlang/OTP
* bmk/snmp/snmp4223_integration: [snmp] Adjust verbosity for some of the log test cases [snmp] Loosing log entries when converting a large Audit Trail Log [snmp] Improving ATL handling of corrupt logs
2013-11-21[snmp] Adjust verbosity for some of the log test casesMicael Karlberg
Also fixed release notes. Used wrong (invalid) ticket number on release notes (111453 instead if 11453).
2013-11-21Merge branch 'ia/odbc/sql.h/OTP-11483' into maintLukas Larsson
* ia/odbc/sql.h/OTP-11483: odbc: Add configure check for sql.h
2013-11-21odbc: Add configure check for sql.hIngela Anderton Andin
2013-11-21[common_test] Don't hang netconf client when close-session times outSiri Hansen
When the netconf server did not respond to the close-session request, the call to ct_netconfc:close_session/2 would hang forever waiting for the netconf client to terminate. This has been corrected. The client will now always terminate (and take down the connection) if the close-session request times out.
2013-11-20erts: Fix alignment bug in allocator start codeSverker Eriksson
Bug never released.