aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-02-22Merge branch 'dgud/observer/doc' into maintDan Gudmundsson
* dgud/observer/doc: Observer: Editorial changes in documentation
2016-02-22Observer: Editorial changes in documentationtmanevik
2016-02-19Merge branch 'rickard/rq-state-bug/OTP-13298' into maintRickard Green
* rickard/rq-state-bug/OTP-13298: Fix bug causing run-queue mask to become inconsistent
2016-02-19Merge branch 'ia/pr/public_key-typos' into maintIngela Anderton Andin
* ia/pr/public_key-typos: Fix public_key documentation typos To correct version of public_key doc in maint, due to a missed push of maint but a push of the maint to master merge, some confusion was caused. Also the original branch (ia/pr/typo-fixes) included ssl typo fixes that where cherry picked and merged from another branch to add to the confusion.
2016-02-19Fix public_key documentation typosMagnus Henoch
2016-02-18Merge branch 'sverk/nif-test-cuddle' into maintSverker Eriksson
* sverk/nif-test-cuddle: erts: Fix wobbling test failure in nif_SUITE
2016-02-18Merge branch 'sverk/openssl-config-doc' into maintSverker Eriksson
* sverk/openssl-config-doc: Add --with-ssl-incl and --with-ssl-rpath to docs
2016-02-18Add --with-ssl-incl and --with-ssl-rpath to docsSverker Eriksson
2016-02-18Merge branch 'legoscia/ssl-doc-typos' into maintHenrik Nord
* legoscia/ssl-doc-typos: Fix typos in ssl.xml OTP-13339
2016-02-18Merge branch 'msantos/ms/typo-windows-build-script' into maintHenrik Nord
* msantos/ms/typo-windows-build-script: Fix typo in Windows build scripts OTP-13337
2016-02-18Merge branch 'hb/kernel/correct_contract/OTP-13335' into maintHans Bolinder
* hb/kernel/correct_contract/OTP-13335: kernel: Correct contract for inet:getifaddrs/1
2016-02-17kernel: Correct contract for inet:getifaddrs/1Hans Bolinder
See also http://bugs.erlang.org/browse/ERL-95.
2016-02-17Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maintHans Bolinder
* hb/add_dialyzer_suppressions/OTP-12862: xmerl: Remove 'no_return' Dialyzer warnings xmerl: Add suppression of Dialyzer warnings eunit: Add suppression of Dialyzer warnings debugger: Add suppression of Dialyzer warnings kernel: Add suppression of Dialyzer warnings mnesia: Add suppression of Dialyzer warnings observer: Add suppression of Dialyzer warnings runtime_tools: Add suppression of Dialyzer warnings stdlib: Add suppression of Dialyzer warnings test_server: Add suppression of Dialyzer warnings tools: Add suppression of Dialyzer warnings
2016-02-17xmerl: Remove 'no_return' Dialyzer warningsHans Bolinder
2016-02-17xmerl: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17eunit: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17debugger: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17kernel: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17mnesia: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17observer: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17runtime_tools: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17stdlib: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17test_server: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17tools: Add suppression of Dialyzer warningsHans Bolinder
2016-02-16Merge branch 'ia/pr/958/OTP-13334' into maintIngela Anderton Andin
* ia/pr/958/OTP-13334: ssl: verify cert signature against original cert binary
2016-02-15Merge branch 'tuncer/ei-breakage' into maintHenrik Nord
* tuncer/ei-breakage: ei: fix breakage reported by Sergei Golovan Revert "musl: fix gethostbyname_r/gethostbyaddr_ selection" OTP-13328
2016-02-15Merge branch 'bjorn/asn1/suppressions/OTP-13324' into maintBjörn Gustavsson
* bjorn/asn1/suppressions/OTP-13324: asn1: Suppress warnings for improper lists in generated code
2016-02-12erts: Fix wobbling test failure in nif_SUITESverker Eriksson
ResA may have been GC'd after its last use.
2016-02-12asn1: Suppress warnings for improper lists in generated codeBjörn Gustavsson
2016-02-12Merge branch 'dgud/mnesia/del_schema_hangs/OTP-13284' into maintDan Gudmundsson
* dgud/mnesia/del_schema_hangs/OTP-13284: mnesia: let loader check if tablelock is needed mnesia: Avoid deadlock possibility in mnesia:del_table_copy schema
2016-02-11Merge branch 'egil/fix-lcnt-dead-code/OTP-13319' into maintBjörn-Egil Dahlberg
* egil/fix-lcnt-dead-code/OTP-13319: tools: Remove dead code in lcnt
2016-02-10tools: Remove dead code in lcntBjörn-Egil Dahlberg
2016-02-10Merge branch 'bjorn/compiler/beam_bsm/OTP-13309' into maintBjörn Gustavsson
* bjorn/compiler/beam_bsm/OTP-13309: Eliminate crash because of unsafe delaying of sub-binary creation
2016-02-10Merge branch 'nybek/speed_up_supervisor_count_children' into maintSiri Hansen
* nybek/speed_up_supervisor_count_children: Speed up supervisor:count_children/1; simple_one_for_one Add supervisor:get_callback_module/1 OTP-13290
2016-02-10Merge branch 'hb/dialyzer/fix_bitstr_bug/OTP-13312' into maintHans Bolinder
* hb/dialyzer/fix_bitstr_bug/OTP-13312: dialyzer: Correct byte_size() and comparisons
2016-02-09mnesia: let loader check if tablelock is neededDan Gudmundsson
move_table_copy needs the lock that was set previously in del_table_copy. This doesn't work on old nodes, so bump protocol version and check it. Remove old protocol conversion code, which have been around since OTP-R15. Checking if lock is needed requires rpc communication via mnesia_gvar ets table to be backwards compatible.
2016-02-09dialyzer: Correct byte_size() and comparisonsHans Bolinder
The argument of byte_size() is a bitstring(). The code in erl_bif_types that finds cases where comparisons always return true or false is corrected when it comes to maps and bit strings.
2016-02-08Merge branch 'sverk/ecc-fixes' into maintSverker Eriksson
OTP-13311 * sverk/ecc-fixes: Ensure testing ssl with supported ciphers only Only use supported EC curves in crypto tests Check the result of EC_GROUP_new_curve_* calls
2016-02-08ssl: verify cert signature against original cert binaryMatt Campbell
When searching for a certificate's issuer in the `CertDB`, verify the signature against the original DER certificate from the handshake instead of a re-encoding of the parsed certificate. This avoids false negatives due to differences between DER encoding implementations of OTP and other platforms.
2016-02-08Merge branch 'sverk/hipe-line-table-bug/OTP-13282' into maintSverker Eriksson
* sverk/hipe-line-table-bug/OTP-13282: erts: Fix bug concerning line information for hipe modules
2016-02-08Merge branch 'sverk/proc-exiting-timer-race/OTP-13245' into maintSverker Eriksson
* sverk/proc-exiting-timer-race/OTP-13245: erts: Fix race between receive timeout and exit signal
2016-02-08Merge branch 'hans/ssh/maint_cuddle_tests' into maintHans Nilsson
2016-02-08ssh: fixes port_command failure on WIndows in ssh_test_cli.erlHans Nilsson
2016-02-08Merge branch 'ia/ssl/handshake-fragmentation/OTP-13306' into maintIngela Anderton Andin
* ia/ssl/handshake-fragmentation/OTP-13306: ssl: Big handshake messages needs to be fragmented on TLS record level
2016-02-08Merge branch 'hb/dialyzer/fix_plt_remove/OTP-13103' into maintHans Bolinder
* hb/dialyzer/fix_plt_remove/OTP-13103: dialyzer: Fix a bug concerning the option 'plt_remove'
2016-02-08dialyzer: Fix a bug concerning the option 'plt_remove'Hans Bolinder
[James Fish:] Dialyzer always asserts that files and directories passed in its options exist. Therefore it is not possible to remove a beam/module from a PLT when the beam file no longer exists. Dialyzer should not to check files exist on disk when removing from the PLT.
2016-02-08Merge branch 'hb/tools/fix_bc_bug/OTP-13277' into maintHans Bolinder
* hb/tools/fix_bc_bug/OTP-13277: tools: Correct a Cover test
2016-02-08tools: Correct a Cover testHans Bolinder
2016-02-08Merge branch 'anders/diameter/appup/OTP-13283' into maintAnders Svensson
* anders/diameter/appup/OTP-13283: Add missing appup after 17.5.6.8 merge
2016-02-08Eliminate crash because of unsafe delaying of sub-binary creationBjörn Gustavsson
The following code would fail to compile: decode(<<Code/integer, Bin/binary>>) -> <<C1/integer, B1/binary>> = Bin, case C1 of X when X =:= 1 orelse X =:= 2 -> Bin2 = <<>>; _ -> Bin2 = B1 end, case Code of 1 -> decode(Bin2); _ -> Bin2 end. The error message would be: t: function decode/1+28: Internal consistency check failed - please report this bug. Instruction: return Error: {match_context,{x,0}}: The beam_bsm pass would delay the creation of a sub-binary when it was unsafe to do so. The culprit was the btb_follow_branch/3 function that for performance reasons cached labels that had already been checked. The problem was the safety of a label also depends on the contents of the registers. Therefore, the key for caching needs to be both the label and the register contents. Reported-by: José Valim