aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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
2016-10-07Merge branch 'dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944' into maintDan Gudmundsson
* dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944: Allow reusing mnesia select continuations
2016-10-07Merge branch 'dgud/tools/emacs/edoc-support/PR-1195/OTP-13945' into maintDan Gudmundsson
* dgud/tools/emacs/edoc-support/PR-1195/OTP-13945: New file erlang-edoc.el to support EDoc in erlang-mode
2016-10-07Merge branch 'maint'Hans Bolinder
* maint: Update per review comments. Fix reference to automatic `undefined` field declared types.
2016-10-07Merge branch 'rohrer/doc/undefined_fields/PR-1189' into maintHans Bolinder
* rohrer/doc/undefined_fields/PR-1189: Update per review comments. Fix reference to automatic `undefined` field declared types.
2016-10-06New file erlang-edoc.el to support EDoc in erlang-modeLeo Liu
- EDoc markup font-locking and tag completion - EDoc comment indentation
2016-10-06Merge branch 'maint'Ingela Anderton Andin
Conflicts: OTP_VERSION
2016-10-06Merge branch 'maint-19' into maintIngela Anderton Andin
2016-10-06Updated OTP versionOTP-19.1.2Erlang/OTP
2016-10-06Update release notesErlang/OTP
2016-10-06Merge branch 'ingela/ssh/channel_exit_handling/OTP-13932' into maint-19Erlang/OTP
* ingela/ssh/channel_exit_handling/OTP-13932: ssh: Prepare release ssh: Handle gen_server:call/3 exits properly
2016-10-06Allow reusing mnesia select continuationsDániel Szoboszlay
A continuation returned by mnesia:select/[14] should be reusable in different, non-transactional activities. Aborting with wrong_transaction doesn't make sense in a dirty context.
2016-10-06beam_bsm: Eliminate unsafe optimizationBjörn Gustavsson
The following code causes a compiler failure: first_after(Data, Offset) -> case byte_size(Data) > Offset of false -> {First, Rest} = {ok, ok}, ok; true -> <<_:Offset/binary, Rest/binary>> = Data, %% 'Rest' saved in y(0) before the call. {First, _} = match_first(Data, Rest), %% When beam_bsm sees the code, the following line %% which uses y(0) has been optimized away. {First, Rest} = {First, Rest}, First end. match_first(_, <<First:1/binary, Rest/binary>>) -> {First, Rest}. Here is the error message from beam_validator: t: function first_after/2+15: Internal consistency check failed - please report this bug. Instruction: {call,2,{f,7}} Error: {multiple_match_contexts,[{x,1},0]}: Basically, what happens is that at time of code generation, the variable 'Rest' is needed after the call to match_first/2 and is therefore saved in y(0). When beam_bsm (a late optimization pass) sees the code, the use of y(0) following the call to match_first/2 has been optimized away. beam_bsm therefore assumes that the delayed sub-binary creation is safe. (Actually, it is safe, but beam_validator does not realize it.) The bug was caused by two separate commits: e199e2471a reduced the number of special cases to handle in BEAM optimization passed by breaking apart the tail-recursive call instructions (call_only and call_last) into separate instructions. Unfortunately, the special handling for tail calls was lost, which resulted in worse code (i.e. the delayed sub-binary creation optimization could not be applied). e1aa422290 tried to compensate, but did so in a way that was not always safe. Teaching beam_validator that this kind of code is safe would be expensive. Instead, we will undo the damage caused by the two commits. Re-introduce the special handling of tail-recursive calls in beam_bsm that was lost in the first commit. (Effectively) revert the change in the second commit. ERL-268
2016-10-05Update per review comments.Doug Rohrer
2016-10-05Merge branch 'maint'Hans Bolinder
* maint: parsetools: Correct counting of newlines
2016-10-05Fix guard test for chardataDan Gudmundsson
Previously only accepted lists tough a call is made to unicode:characters_to_binary/1, and the functions where specified to handle chardata.
2016-10-05Merge branch 'hasse/parsetools/fix_leex_counting/ERL-263/OTP-13916' into maintHans Bolinder
* hasse/parsetools/fix_leex_counting/ERL-263/OTP-13916: parsetools: Correct counting of newlines
2016-10-05Merge branch 'master' into sverker/master/load_nif-print-init-errorSverker Eriksson
2016-10-05Merge branch 'maint'Dan Gudmundsson
* maint: wx: add wxWindowDragAcceptFiles wx: Add simple dropfiles support
2016-10-05Merge branch 'dgud/wx/drop-files/OTP-13933' into maintDan Gudmundsson
* dgud/wx/drop-files/OTP-13933: wx: add wxWindowDragAcceptFiles wx: Add simple dropfiles support
2016-10-05ssh: Prepare releaseIngela Anderton Andin