aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-05-31Merge remote-tracking branch 'origin/ingela/ssl/dtls-test-cuddle'Ingela Anderton Andin
* origin/ingela/ssl/dtls-test-cuddle: ssl: Fix TLS version handling in dtls adepted tests
2016-05-31Merge branch 'dgud/wx/fix-seqfault-in-cleanup'Dan Gudmundsson
* dgud/wx/fix-seqfault-in-cleanup: wx: Fix occasional seq fault after appliction stops
2016-05-30Merge branch 'margnus1/llvm-upgrades/PR-1070'Sverker Eriksson
2016-05-30Merge branch 'sverker/crypto/gcm-evp-bug/ERL-144'Sverker Eriksson
2016-05-30Merge branch 'dgud/wx/quote-atoms-in-specs'Dan Gudmundsson
* dgud/wx/quote-atoms-in-specs: wx: Quote atoms in types and specs
2016-05-30Merge branch 'dgud/stdlib/relax-proc_lib-initial-call/OTP-13623'Dan Gudmundsson
* dgud/stdlib/relax-proc_lib-initial-call/OTP-13623: Relax translation of initial calls
2016-05-30wx: Fix occasional seq fault after appliction stopsDan Gudmundsson
There seems to be a timeing dependent double delete when doing reference cleanup after wx:destroy(). wxGraphicsObjects can thus not be free'ed by wx in the cleanup phase. A guess is that the underlying rendering context deletes all graphics objects without careeing about wxWidgets reference counting.
2016-05-30Update primary bootstrapBjörn Gustavsson
2016-05-30Merge branch 'kostis/beam_disasm-entry-type/PR-1072'Björn Gustavsson
* kostis/beam_disasm-entry-type/PR-1072: Declare the type of function entry points Export label() type
2016-05-27ssl: Fix TLS version handling in dtls adepted testsIngela Anderton Andin
2016-05-27Update preloadedSverker Eriksson
2016-05-27Merge branch 'richcarl/erts/fix-init-stop/PR-911/OTP-13630/OTP-13631'Sverker Eriksson
2016-05-27Declare the type of function entry pointsKostis Sagonas
This shuts off compiler warnings and will allow to enable stronger compiler checks files that include beam_disasm.hrl in the hipe application. While doing that, also modified a comment in the header file and turned a case statement into effectively an assertion: there should not really be any beam files where functions do not have a label as entry point, right?
2016-05-27Export label() typeKostis Sagonas
2016-05-27Merge branch 'egil/et/fix-unmatched_return/OTP-13595'Björn-Egil Dahlberg
* egil/et/fix-unmatched_return/OTP-13595: et: Fix unmatched return warnings
2016-05-27Merge branch 'egil/runtime_tools/update-lttng-doc'Björn-Egil Dahlberg
* egil/runtime_tools/update-lttng-doc: runtime_tools: Document a lttng usage example
2016-05-27Merge branch 'ingela/ssl/doc-enhancment/ERL-131'Ingela Anderton Andin
* ingela/ssl/doc-enhancment/ERL-131: ssl: Add default values and clarifications
2016-05-27ssl: Add default values and clarificationsIngela Anderton Andin
2016-05-27Merge branch 'kennethlakin/beast-mitigation-options/PR-1041/OTP-13629'Ingela Anderton Andin
* kennethlakin/beast-mitigation-options/PR-1041/OTP-13629: ssl: Add BEAST mitigation selection option
2016-05-27Merge branch 'rickard/doc-fix'Rickard Green
* rickard/doc-fix: Minor doc fix
2016-05-27Minor doc fixRickard Green
2016-05-27Merge branch 'rickard/on_heap-fix/OTP-13366'Rickard Green
* rickard/on_heap-fix/OTP-13366: Improve message allocation in enif_send() Fix message queue update on replacement and removal of message
2016-05-27Merge branch 'rickard/rm-mqd-mixed/OTP-13366'Rickard Green
* rickard/rm-mqd-mixed/OTP-13366: Remove the 'message_queue_data' option 'mixed'
2016-05-27Merge branch 'lukas/erts/win-large_binary_port_command/OTP-13628'Lukas Larsson
* lukas/erts/win-large_binary_port_command/OTP-13628: erts: Split large binaries into multiple iovec
2016-05-27erts: Split large binaries into multiple iovecLukas Larsson
On windows the max size of an iov element is long, i.e. 4GB so in order to write larger binaries to file we split the binary into smaller 2GB chunks so that the write is possible.
2016-05-27Merge branch 'lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267'Lukas Larsson
* lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267: runtime_tools: Fix erl_tracer testcases runtime_tools: Fix documentation for dbg:p erts: Move tracer SecondTraceTerm to Opts map
2016-05-27Merge branch 'legoscia/erts/epmd-module-option/OTP-13627'Lukas Larsson
* legoscia/erts/epmd-module-option/OTP-13627: Add tests for -start_epmd and -epmd_module options Use the -epmd_module flag consistently Add -start_epmd command line option
2016-05-26crypto: Add OpenSSL_version macrosSverker Eriksson
to make it easier to read and construct version checks.
2016-05-26runtime_tools: Document a lttng usage exampleBjörn-Egil Dahlberg
2016-05-26crypto: Allow any AES-GCM tag length for non-EVP implSverker Eriksson
Same fix as was done for EVP in f4f588683dce36c447017.
2016-05-26Improve message allocation in enif_send()Rickard Green
2016-05-26Fix message queue update on replacement and removal of messageRickard Green
2016-05-26crypto: Workaround buggy GCM via EVPSverker Eriksson
2016-05-26et: Fix unmatched return warningsBjörn-Egil Dahlberg
2016-05-26Merge branch 'siri/observer/improve-trace/OTP-13481'Siri Hansen
* siri/observer/improve-trace/OTP-13481: [observer] Update user guide [observer] Automatically add active node [observer] Allow more trace flags on procs/ports from GUI [runtime_tools] Don't trace the trace client port [runtime_tools] Allow setting trace flag 'exiting' with dbg [observer] Add more default match specs for messages [observer] Add test of new Ports tab [observer] Improve appearance in Trace tab [observer] Allow multiple select in Ports tab [observer] Make right click menu act on the "expected pid" [observer] In Trace tab, show procs/ports for selected node only [observer] Add right click menu in Table tab [observer] Add menu option to set default MS for send/receive [observer] Add tracing of ports [ttb] Allow setting trace flags on ports [observer] Set correct parent in Label dialog [observer] Add Ports tab in GUI [observer] Add functionality in GUI for trace pattern on messages [ttb] Set trace patterns on messages Conflicts: lib/observer/src/observer_wx.erl
2016-05-26hipe_llvm: Export hipe literals as LLVM metadataMagnus Lång
LLVM currently hard-codes these. Since it is desirable to be able to change things like PCB layout without requiring a change to LLVM, we export these as LLVM metadata, which can easily be used from LLVM to make it independent of them.
2016-05-26Merge branch 'margnus1/llvm-compatibility/PR-1057/OTP-13626'Sverker Eriksson
2016-05-26Merge branch 'margnus1/hipe/maps-is_key-opts/PR-1069/OTP-13625'Björn-Egil Dahlberg
* margnus1/hipe/maps-is_key-opts/PR-1069/OTP-13625: hipe: Add test suite for verifying optimisations Added elimination of maps:is_key/2 calls to HiPE
2016-05-26Merge branch 'egil/update-efficiency-guide'Björn-Egil Dahlberg
* egil/update-efficiency-guide: doc: Update version of erts and otp release doc: Update process memory initial size doc: Update efficiency guide with Maps memory info
2016-05-26ssl: Add BEAST mitigation selection optionKenneth Lakin
Some legacy TLS 1.0 software does not tolerate the 1/n-1 content split BEAST mitigation technique. This commit adds a beast_mitigation SSL option (defaulting to one_n_minus_one) to select or disable the BEAST mitigation technique. Valid option values are (one_n_minus_one | zero_n | disabled).
2016-05-25Add tests for -start_epmd and -epmd_module optionsMagnus Henoch
For -start_epmd, check that the node starts properly and that we can ping it. For -epmd_module, start two nodes that can communicate only because we supply the correct port number through a command line argument.
2016-05-25Use the -epmd_module flag consistentlyMagnus Henoch
If the -epmd_module flag has been specified on the command line, use that module to register and look up node names instead of the default, erl_epmd. Also document this option.
2016-05-25Add -start_epmd command line optionMagnus Henoch
Add a command line option that lets you disable automatic starting of epmd when starting a distributed node. This differs from the undocumented setting -no_epmd, in that it does not affect the starting of an erl_epmd process within erl_distribution: the newly started node will expect an epmd instance to have been started previously.
2016-05-25doc: Update version of erts and otp releaseBjörn-Egil Dahlberg
2016-05-25Remove the 'message_queue_data' option 'mixed'Rickard Green
2016-05-25runtime_tools: Fix erl_tracer testcasesLukas Larsson
2016-05-25Merge branch ↵Raimo Niskanen
'dcsommer/kernel/inet-gethostbyname-res-option-inet6/PR-1065/OTP-13622' * dcsommer/kernel/inet-gethostbyname-res-option-inet6/PR-1065/OTP-13622: Make inet:gethostbyname respect resolver option `inet6`
2016-05-25erts: Update preloadedSverker Eriksson
2016-05-25hipe: Add halt/2 to functions that always failSverker Eriksson
Seems like halt/2 should be a member of this club.
2016-05-25erts: Remove unnecessary halt string truncationSverker Eriksson
as erlang:halt does it for us now