aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-08-06Merge branch 'maint'Hans Nilsson
* maint: ssh: diffie-hellman-group14-sha1
2015-08-06Merge branch 'hans/ssh/diffie-hellman-group14-sha1/OTP-12671' into maintHans Nilsson
* hans/ssh/diffie-hellman-group14-sha1/OTP-12671: ssh: diffie-hellman-group14-sha1
2015-08-05ssh: diffie-hellman-group14-sha1Hans Nilsson
2015-08-05Merge branch 'maint'Björn Gustavsson
* maint: Fix crash when disassembling modules with BIFs
2015-08-05Merge branch 'bjorn/erts/beam_debug' into maintBjörn Gustavsson
* bjorn/erts/beam_debug: Fix crash when disassembling modules with BIFs
2015-08-04Merge branch 'maint'Hans Nilsson
* maint: ssh: added more groups for gex ssh: rm ssh_math and use crypto:compute_key instead ssh: filter algs unknown to crypto (except pk) ssh: add test group ssh: Add experimental 'diffie-hellman-group-exchange-sha256 support ssh: Repair/add experimental diffie-hellman-group-exchange-sha1 support
2015-08-04Merge branch 'hans/ssh/diffie-hellman-group-exchange-shaN/OTP-12672' into maintHans Nilsson
* hans/ssh/diffie-hellman-group-exchange-shaN/OTP-12672: ssh: added more groups for gex ssh: rm ssh_math and use crypto:compute_key instead ssh: filter algs unknown to crypto (except pk) ssh: add test group ssh: Add experimental 'diffie-hellman-group-exchange-sha256 support ssh: Repair/add experimental diffie-hellman-group-exchange-sha1 support
2015-08-03ssh: added more groups for gexHans Nilsson
2015-08-03ssh: rm ssh_math and use crypto:compute_key insteadHans Nilsson
2015-08-03ssh: filter algs unknown to crypto (except pk)Hans Nilsson
2015-08-03ssh: add test groupHans Nilsson
2015-08-03ssh: Add experimental 'diffie-hellman-group-exchange-sha256 supportHans Nilsson
DO NOT USE IN PRODUCTION!!! It is not enabled by default, but may be enabled with the option {preferred_algorithms, [{kex, ['diffie-hellman-group-exchange-sha256']}]}
2015-08-03ssh: Repair/add experimental diffie-hellman-group-exchange-sha1 supportHans Nilsson
DO NOT USE IN PRODUCTION!!! This is a bug fixing of the previously partly impelmented kex algorithm. There are more things to do, for example genrate/select better g,p pair obeying the min||n||max request. It is not enabled by default, but may be enabled with the option {preferred_algorithms, [{kex, ['diffie-hellman-group-exchange-sha1']}]}
2015-07-31Merge branch 'maint'Zandra Hird
* maint: inets: cancel for handler with no requests
2015-07-30Merge branch 'scrapinghub/cancel_httpc_handler_with_no_requests' into maintZandra Hird
OTP-12922 * scrapinghub/cancel_httpc_handler_with_no_requests: inets: cancel for handler with no requests
2015-07-30Merge branch 'emacstheviking/maint'Zandra Hird
* emacstheviking/maint: Increased left-nav width for readability
2015-07-16Increased left-nav width for readabilitySean Charles
It just makes it easier to read stuff. For example, gen_server functions are now totally visible, no more guessing.
2015-07-16inets: cancel for handler with no requestsKirilll Zaborsky
httpc_handler should react properly to cancel requests even when the request to be cancelled was already finished but httpc_manager did not get notified about that yet
2015-07-14erts: Update major version numberLukas Larsson
2015-07-14Merge branch 'lukas/ose/remove/OTP-12573'Lukas Larsson
* lukas/ose/remove/OTP-12573: Remove OSE from erl_interface ose: Remove all code related to the OSE port
2015-07-10Remove OSE from erl_interfaceLukas Larsson
2015-07-10ose: Remove all code related to the OSE portLukas Larsson
The OSE port is no longer supported and this commit removed it and any changes related to it. The things that were general improvements have been left in the code.
2015-07-09Merge branch 'maint'Zandra Hird
2015-07-09Merge branch 'c-rack/fix-typo2' into maintZandra Hird
* c-rack/fix-typo2: Fix small typo
2015-07-09Fix small typoConstantin Rack
2015-07-09Merge branch 'maint'Zandra Hird
2015-07-09Merge branch 'redvers/public_key_docfix' into maintZandra Hird
* redvers/public_key_docfix: Updated documentation to match implementation
2015-07-08Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release Fix calculation of end time Prefer monotonic time that stop during suspend Avoid unnecessary copying of data when retrieving corrected monotonic time Add the --enable-gettimeofday-as-os-system-time configure switch Conflicts: OTP_VERSION erts/vsn.mk
2015-07-08Merge branch 'maint-18' into maintRickard Green
* maint-18: Updated OTP version Prepare release Fix calculation of end time Prefer monotonic time that stop during suspend Avoid unnecessary copying of data when retrieving corrected monotonic time Add the --enable-gettimeofday-as-os-system-time configure switch
2015-07-08Updated OTP versionOTP-18.0.2Erlang/OTP
2015-07-08Prepare releaseErlang/OTP
2015-07-08Merge branch 'rickard/end-time-fix/OTP-12896' into maint-18Erlang/OTP
* rickard/end-time-fix/OTP-12896: Fix calculation of end time
2015-07-08Merge branch 'rickard/monotonic-clock-source/OTP-12895' into maint-18Erlang/OTP
* rickard/monotonic-clock-source/OTP-12895: Prefer monotonic time that stop during suspend
2015-07-08Merge branch 'rickard/read_corrected_time/OTP-12894' into maint-18Erlang/OTP
* rickard/read_corrected_time/OTP-12894: Avoid unnecessary copying of data when retrieving corrected monotonic time
2015-07-08Merge branch 'rickard/gettimeofday/OTP-12892' into maint-18Erlang/OTP
* rickard/gettimeofday/OTP-12892: Add the --enable-gettimeofday-as-os-system-time configure switch
2015-07-08Merge branch 'rickard/trace-file-eintr-bug/OTP-12890' into maint-18Erlang/OTP
* rickard/trace-file-eintr-bug/OTP-12890: Handle EINTR in trace_file_drv
2015-07-08Merge branch 'rickard/non-smp-trace-port-exit-bug/OTP-12889' into maint-18Erlang/OTP
* rickard/non-smp-trace-port-exit-bug/OTP-12889: Teach non-smp VM how to deal with trace port crash Test case testing crash in tracer port
2015-07-08Fix calculation of end timeRickard Green
2015-07-08Prefer monotonic time that stop during suspendRickard Green
2015-07-08Avoid unnecessary copying of data when retrieving corrected monotonic timeRickard Green
2015-07-08Fix crash when disassembling modules with BIFsBjörn Gustavsson
In a debug-compiled emulator, running erts_debug:df(io) would trigger an assertion failure: 1> erts_debug:df(io). beam/beam_debug.c:301:erts_debug_disassemble_1() Assertion failed: (((funcinfo[0]) & 0x3F) == ((0x0 << 4) | ((0x2 << 2) | 0x3))) Aborted (core dumped) It turns out that the assertion is wrong. It should have been updated in 64ccd8c9b7a7 which made it possible to have stubs for BIFs in the BEAM code for a module. The faulty assertion was only found when when 16317f73f79265 added a smoke test of the BEAM disassembler.
2015-07-08Merge branch 'maint'Dan Gudmundsson
* maint: wx: Add event callback fastpath wx: Event callbacks could hang wx application temporary wx: Make wxLANGUAGE_ variable wx: Send wxWdigets assert to error logger wx: Add mouse_capture_lost event wx: Fix code generator
2015-07-08Merge branch 'dgud/wx/send-asserts-to-erl' into maintDan Gudmundsson
* dgud/wx/send-asserts-to-erl: wx: Add event callback fastpath wx: Event callbacks could hang wx application temporary wx: Make wxLANGUAGE_ variable wx: Send wxWdigets assert to error logger wx: Add mouse_capture_lost event wx: Fix code generator
2015-07-07Add the --enable-gettimeofday-as-os-system-time configure switchRickard Green
Forces usage of gettimeofday() for OS system time
2015-07-07Merge branch 'maint'Zandra Hird
2015-07-07Merge branch 'maint-17' into maintZandra Hird
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/runtime_tools/doc/src/notes.xml lib/runtime_tools/vsn.mk otp_versions.table
2015-07-07wx: Add event callback fastpathDan Gudmundsson
Avoids spawn but can deadlock
2015-07-07Merge branch 'bjorn/erts/clang-opt'Björn Gustavsson
* bjorn/erts/clang-opt: (27 commits) Improve unpacking performance on x86_64 Slightly tweak the peformance for get_list Speed up list matching Eliminate the variable temp_bits at the top scope of process_main() Eliminate prefetch for conditional instructions Teach beam_makeops to pack operands for move3 and move_window Ensure that the move_call_ext_{last,only} instructions are used beam_makeops: Eliminate unnecessary masking when packing 3 operands Use a cheaper tag scheme for 'd' operands Introduce swap_temp/3 and swap/2 Introduce specialized versions of move2 Add back frequently used x(0) instructions Rewrite the hipe_mode_switch instructions Remove the last use of tmp_arg1 Eliminate use of tmp_arg1 and tmp_arg2 in bit syntax Remove the i_fetch instruction Eliminate use of i_fetch for bit syntax instructions Eliminate the use of i_fetch for BIF instructions Eliminate the use of i_fetch for relational operators Eliminate the use of i_fetch in arithmetic instructions ...
2015-07-06Updated OTP versionOTP-17.5.6.2Erlang/OTP
2015-07-06Prepare releaseErlang/OTP