aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-10-14Merge branch 'maint'Hans Nilsson
Conflicts: OTP_VERSION
2016-10-14Merge branch 'maint-19' into maintHans Nilsson
2016-10-13Updated OTP versionOTP-19.1.4Erlang/OTP
2016-10-13Prepare releaseErlang/OTP
2016-10-13Merge branch 'hans/ssh/harmful_badmatch/OTP-13966' into maint-19Erlang/OTP
* hans/ssh/harmful_badmatch/OTP-13966: ssh: Removed matching of 'ok' after send which could cause error reports ssh: ssh_protocol_SUITE test for handling of illegal info_lines ssh: property test case for illegal infoline and close This tests an illegal client that sends an info line and closes 'immediatly'.
2016-10-13ssh: Removed matching of 'ok' after send which could cause error reportsHans Nilsson
2016-10-13ssh: ssh_protocol_SUITE test for handling of illegal info_linesHans Nilsson
2016-10-13ssh: property test case for illegal infoline and closeHans Nilsson
This tests an illegal client that sends an info line and closes 'immediatly'.
2016-10-13Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Fix opaque bug dialyzer: Fix opaque bugs
2016-10-13Merge branch 'hasse/dialyzer/fix_opaque_bugs/OTP-13693' into maintHans Bolinder
* hasse/dialyzer/fix_opaque_bugs/OTP-13693: dialyzer: Fix opaque bug dialyzer: Fix opaque bugs
2016-10-12Merge branch 'lukas/erts/beam_func_info_struct/OTP-13821'Lukas Larsson
* lukas/erts/beam_func_info_struct/OTP-13821: erts: Fix some dtrace related compile issues erts: Refactor rename Export.code[] to Export.beam[] erts: Improve printouts for some etp commands erts: Fix erts_debug:df with new func_info erts: Refactor find_function_from_pc to return MFA erts: Refactor out func_info into struct
2016-10-12erts: Fix some dtrace related compile issuesLukas Larsson
2016-10-12erts: Refactor rename Export.code[] to Export.beam[]Sverker Eriksson
to avoid scary merge errors.
2016-10-12erts: Improve printouts for some etp commandsLukas Larsson
Specifically etp-stacktrace/stackdump/process-info have been changed
2016-10-12erts: Fix erts_debug:df with new func_infoLukas Larsson
2016-10-12erts: Refactor find_function_from_pc to return MFALukas Larsson
2016-10-12erts: Refactor out func_info into structLukas Larsson
This commit adds two new structs to be used to represent erlang code in erts. ErtsCodeInfo is used to describe the i_func_info header that is part of all Export entries and the prelude of each function. This replaces all the BeamInstr * that were previously used to point to these locations. After this change the code should never use BeamInstr * with offsets to figure out different parts of the func_info header. ErtsCodeMFA is a struct that is used to descripe a MFA in code. It is used within ErtsCodeInfo and also in Process->current. All function that previously took Eterm * or BeamInstr * to identify a MFA now use the ErtsCodeMFA or ErtsCodeInfo where appropriate. The code has been tested to work when adding a new field to the ErtsCodeInfo struct, but some updates are needed in ops.tab to make it work.
2016-10-12Merge branch 'maint'Hans Bolinder
* maint: Update Dialyzer documentation
2016-10-12Merge branch 'xsipewe/dialyzer/doc_cleanup' into maintHans Bolinder
* xsipewe/dialyzer/doc_cleanup: Update Dialyzer documentation
2016-10-11Merge branch 'legoscia/ssl_in_fips_mode/PR-1180/OTP-13921'Hans Nilsson
Conflicts: lib/crypto/c_src/crypto.c lib/ssl/src/ssl_cipher.erl
2016-10-11Merge branch 'maint'Ingela Anderton Andin
2016-10-11Merge remote-tracking branch 'github/pr/1199' into maintIngela Anderton Andin
* github/pr/1199: Correct a typo in mod_esi documentation
2016-10-11Merge branch 'maint'Ingela Anderton Andin
2016-10-11Merge branch 'ingela/ssl/algo-check/OTP-13959' into maintIngela Anderton Andin
* ingela/ssl/algo-check/OTP-13959: Properly filter ssl cipher suites reported as supported
2016-10-11Merge branch 'ingela/ssl/crl_SUITE' into maintIngela Anderton Andin
* ingela/ssl/crl_SUITE: ssl: Make sure test has correct input
2016-10-11Merge branch 'maint'Hans Nilsson
Conflicts: OTP_VERSION
2016-10-11Merge branch 'maint-19' into maintHans Nilsson
2016-10-11Merge branch 'maint'Björn-Egil Dahlberg
2016-10-11Merge branch 'egil/erts/fix-profile_boot-flag/ERL-280/OTP-13955' into maintBjörn-Egil Dahlberg
* egil/erts/fix-profile_boot-flag/ERL-280/OTP-13955: Update preloaded init.beam erts: Fix -profile_boot 'true'|'false' parsing
2016-10-11Update Dialyzer documentationxsipewe
Language cleaned up by the technical writer xsipewe from Combitech. Proofreading and corrections by Hans Bolinder.
2016-10-10Correct a typo in mod_esi documentationWill
2016-10-10Update preloaded init.beamBjörn-Egil Dahlberg
2016-10-10erts: Fix -profile_boot 'true'|'false' parsingBjörn-Egil Dahlberg
Strictly speaking 'true' and 'false' arguments is not necessary, but it should work if supplied.
2016-10-10Merge branch 'sverker/master/load_nif-print-init-error/OTP-13951'Sverker Eriksson
2016-10-10Updated OTP versionOTP-19.1.3Erlang/OTP
2016-10-10Prepare releaseErlang/OTP
2016-10-10Merge branch 'hans/ssh/revert_nonblocking_sender_seq13199/OTP-13953' into ↵Erlang/OTP
maint-19 * hans/ssh/revert_nonblocking_sender_seq13199/OTP-13953: Revert "ssh: Add non-blocking send" since it introduces Error Reports
2016-10-10Revert "ssh: Add non-blocking send" since it introduces Error ReportsHans Nilsson
This reverts commit 28baf1314b556bb592c24181f6967e1f324f44a7.
2016-10-10Merge branch 'sverker/load_nif-print-init-error/OTP-13951' into maintSverker Eriksson
* sverker/load_nif-print-init-error: crypto: Return source line number from failed load/upgrade erts: Print error code from failed NIF load/upgrade/reload
2016-10-10Properly filter ssl cipher suites reported as supportedDániel Szoboszlay
Adapted from commit 675ee6860d2c273bcc6c6a0536634a107e2a3d9f. Conflicts: lib/ssl/src/ssl_cipher.erl
2016-10-07Merge branch 'maint'Björn Gustavsson
* maint: beam_bsm: Eliminate unsafe optimization
2016-10-07Merge branch 'bjorn/compiler/beam_bsm/ERL-268/OTP-13947' into maintBjörn Gustavsson
* bjorn/compiler/beam_bsm/ERL-268/OTP-13947: beam_bsm: Eliminate unsafe optimization
2016-10-07Merge branch 'maint'Ingela Anderton Andin
2016-10-07Merge branch 'ingela/inets/httpc/ERL-253' into maintIngela Anderton Andin
* ingela/inets/httpc/ERL-253: inets: httpc improve error handling
2016-10-07Merge branch 'maint'Ingela Anderton Andin
2016-10-07Merge branch 'kostis/inets-reference-record-types/PR-1188' into maintIngela Anderton Andin
* kostis/inets-reference-record-types/PR-1188: Replace ref() with reference() in inets files
2016-10-07Merge branch 'maint'Ingela Anderton Andin
2016-10-07Merge branch 'ingela/ssl/cipher-type-spec' into maintIngela Anderton Andin
* ingela/ssl/cipher-type-spec: ssl: Adjust cipher type to conform to implementation
2016-10-07Merge branch 'maint'Dan Gudmundsson
* maint: New file erlang-edoc.el to support EDoc in erlang-mode Allow reusing mnesia select continuations Fix guard test for chardata
2016-10-07Merge branch 'dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934' into maintDan Gudmundsson
* dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934: Fix guard test for chardata
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 10:18:06 +0000