aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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 '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 '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-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-05Update per review comments.Doug Rohrer
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 '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
2016-10-05ssh: Handle gen_server:call/3 exits properlyIngela Anderton Andin
Handle all possible exit values that should be interpreted as {error, closed}. Failing to do so could lead to unexpected crashes for users of the ssh application.
2016-10-05Update primary bootstrapBjörn Gustavsson
2016-10-05Merge branch 'bjorn/compiler/beam_block/ERL-266/OTP-13931' into maintBjörn Gustavsson
* bjorn/compiler/beam_block/ERL-266/OTP-13931: beam_block: Avoid unsafe inclusion of get_map_elements in blocks
2016-10-05beam_block: Avoid unsafe inclusion of get_map_elements in blocksBjörn Gustavsson
c2035ebb8b restricted the get_map_elements instruction so that it could only occur at the beginning of a block. It turns out that including it anywhere in a block is unsafe. Therefore, never put get_map_elements instruction in blocks. (Also remove the beam_utils:join_even/2 function since it is no longer used.) ERL-266
2016-10-05Merge branch 'dgud/emacs/do-not-require-final-newline/PR-1130' into maintDan Gudmundsson
* dgud/emacs/do-not-require-final-newline/PR-1130: erlang-mode: do not configure require-final-newline
2016-10-05ssl: Adjust cipher type to conform to implementationIngela Anderton Andin
2016-10-05Merge branch 'cypherfox/edoc/add_doc/PR-1175' into maintHans Bolinder
* cypherfox/edoc/add_doc/PR-1175: add info for param and returns tags
2016-10-05Merge branch 'hizel/howto/win32-include-path-fix/PR-1187' into maintLukas Larsson
* hizel/howto/win32-include-path-fix/PR-1187: Fix build environment script in HOWTO INSTALL-WIN32
2016-10-04Fix reference to automatic `undefined` field declared types.Doug Rohrer
In 8ce35b287fb50a6845fccf6a13c672aae303dc91 automatic insertion of `undefined` for record fields without initializers was removed, but this was not noted in the documentation. Add a warning about this change using similar verbiage as the original docs.
2016-10-04Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maintRaimo Niskanen
* RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896: disable RC4 in SSL when crypto doesn't support it Fix compilation when OpenSSL doesn't support RC4 Conflicts: lib/crypto/c_src/crypto.c
2016-10-04Merge branch 'legoscia/crypto/no-rc2/PR-1163/OTP-13895' into maintRaimo Niskanen
* legoscia/crypto/no-rc2/PR-1163/OTP-13895: Fix compilation when OpenSSL doesn't support RC2
2016-10-04Merge branch 'ingela/ssl/tests/ssl_packet_0_or_raw' into maintIngela Anderton Andin
* ingela/ssl/tests/ssl_packet_0_or_raw: ssl: Correct tests tcp stream handling
2016-10-04ssl: Correct tests tcp stream handlingIngela Anderton Andin
Data collection function active_once_raw/4 did not handle streamed data correctly (it assumed the stream was "packet oriented"), which could result in that the test case perceived that it did not receive all data even though it did.
2016-10-04Fix build environment script in HOWTO INSTALL-WIN32Ildar Khizbulin
2016-10-04add info for param and returns tagsLutz Behnke
2016-10-03Merge branch 'lukas/erts/bin_to_term_doc_example/PR-1181' into maintLukas Larsson
* lukas/erts/bin_to_term_doc_example/PR-1181: erts: Add examples to binary_to_term and term_to_binary
2016-10-03Merge branch 'ingela/ssl/anonymous/OTP-13926' into maintIngela Anderton Andin
* ingela/ssl/anonymous/OTP-13926: ssl: Correct anonymous suite handling
2016-10-03Merge branch 'lukas/erts/fix_errno_name/OTP-13927' into maintLukas Larsson
* lukas/erts/fix_errno_name/OTP-13927: erts: Rename __errno in order to avoid conflict on openbsd
2016-09-30ssl: Correct anonymous suite handlingIngela Anderton Andin
Test suite did not take TLS-version in to account. Also some anonymous suites where included incorrectly in some TLS versions.
2016-09-29Merge branch 'rickard/macosx-config-mess/OTP-13904' into maintRickard Green
* rickard/macosx-config-mess/OTP-13904: Try to handle not yet available functionality in MacOSX SDK Check deployment target in configure on MacOSX Fix posix_memalign configure test
2016-09-29Merge branch 'maint-19' into maintIngela Anderton Andin
2016-09-29Merge branch 'siri/doc-add_pathsa-order/ERL-267/OTP-13920' into maintSiri Hansen
* siri/doc-add_pathsa-order/ERL-267/OTP-13920: Document the order of directories added with code:add_pathsa/1
2016-09-29wx: add wxWindowDragAcceptFilesDan Gudmundsson
Enable window to handle drop file events.
2016-09-29parsetools: Correct counting of newlinesHans Bolinder
See https://bugs.erlang.org/browse/ERL-263 The fix in commit c9bc5c94 of PR-431 (https://github.com/erlang/otp/pull/431) introduced new problems.
2016-09-29Merge branch 'hasse/parsetools/fix_leex_unicode/OTP-13919' into maintHans Bolinder
* hasse/parsetools/fix_leex_unicode/OTP-13919: parsetools: Correct handling of Unicode in Leex
2016-09-28Document the order of directories added with code:add_pathsa/1Siri Hansen
code:add_pathsa/1 reverts the list of directories when adding it at the beginning of the code path. The command line option '-pa' behaves in the same way. This is now documented.
2016-09-28Try to handle not yet available functionality in MacOSX SDKRickard Green
2016-09-28Merge branch ↵Siri Hansen
'legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907' into maint * legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907: Don't report error for shutdown exit tuple
2016-09-28wx: Add simple dropfiles supportDan Gudmundsson
Added wxDropFiles event
2016-09-28Merge branch 'hans/ssh/update_vsn.mk' into maintHans Nilsson
2016-09-28ssh: Update vsn.mkHans Nilsson
2016-09-28Merge branch 'isvilen/ssh_REPL_exit_status/PR-1173/OTP-13905' into maintHans Nilsson
2016-09-28Merge branch 'lucafavatella/erts/fix-typo-fp/PR-1177' into maintBjörn-Egil Dahlberg
* lucafavatella/erts/fix-typo-fp/PR-1177: Fix typo in configuration description
2016-09-28Merge remote-tracking branch 'github/pr/1183' into maintIngela Anderton Andin
* github/pr/1183: Fix typos in public_key_app.xml