aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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-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-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
2016-09-28Merge branch 'ahmedshafeeq/inets-httpc-RFC-7231/PR-1172/OTP-13902' into maintIngela Anderton Andin
* ahmedshafeeq/inets-httpc-RFC-7231/PR-1172/OTP-13902: Update test case docs with RFC-7231 Update behavior of httpc:request to match RFC-7231
2016-09-28Updated OTP versionOTP-19.1.1Erlang/OTP
2016-09-28Update release notesErlang/OTP
2016-09-28Merge branch 'ingela/ssl/prepare-patch' into maint-19Erlang/OTP
* ingela/ssl/prepare-patch: ssl: Prepare for release
2016-09-28Merge branch 'ingela/ssl/ECC-selection-fix/OTP-13918' into maint-19Erlang/OTP
* ingela/ssl/ECC-selection-fix/OTP-13918: ssl: Correct ECC curve selection, the error could cause default to always be selected.
2016-09-28Merge branch 'ingela/ssl/handshake-event-queue/OTP-13917' into maint-19Erlang/OTP
* ingela/ssl/handshake-event-queue/OTP-13917: ssl: Avoid event reordering
2016-09-28parsetools: Correct handling of Unicode in LeexHans Bolinder
The 'dfa_graph' option did not work with Unicode. The testcase 'unicode' was not correct.
2016-09-28ssl: Correct ECC curve selection, the error could cause default to always be ↵Ingela Anderton Andin
selected.
2016-09-27Update test case docs with RFC-7231Ahmed Shafeeq Bin Mohd Shariff
2016-09-27Merge branch 'sverker/cerl-dump-macos' into maintSverker Eriksson
2016-09-27Fix typos in public_key_app.xmlMagnus Henoch
2016-09-27ssl: Prepare for releaseIngela Anderton Andin
2016-09-27ssl: Avoid event reorderingIngela Anderton Andin
Several handshake events may be received in the same TLS packet. Then there will be several events pushed to the gen_statems internal queue. New events already in the socket-buffer should not be processed if there are more unprocessed handshake events in next_event queue. We need to handle this in the next_record/1 function.
2016-09-27Merge branch 'andrey/stdlib/fix_edlin_expand/ERL-1152' into maintHans Bolinder
* andrey/stdlib/fix_edlin_expand/ERL-1152: stdlib: Add a testcase for Unicode expander Support for unicode expander
2016-09-27erts: Add examples to binary_to_term and term_to_binaryLukas Larsson
2016-09-27erts: Rename __errno in order to avoid conflict on openbsdLukas Larsson
2016-09-27Merge branch 'siri/ttb/ip-client-queue-size/OTP-13829' into maintSiri Hansen
* siri/ttb/ip-client-queue-size/OTP-13829: [ttb] Add option <c>queue_size</c> to tracer/2
2016-09-27Merge branch 'siri/appups-19.1/OTP-13912' into maintSiri Hansen
* siri/appups-19.1/OTP-13912: Update appups in kernel and stdlib for OTP versions > 19.1
2016-09-27Merge branch 'siri/ct_telnet-typo/OTP-13913' into maintSiri Hansen
* siri/ct_telnet-typo/OTP-13913: Fix typo in documentation for ct_telnet:expect/3