aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-12-20Merge branch 'lukas/erts/fix-seq_trace-reset_trace/OTP-15490' into maintLukas Larsson
* lukas/erts/fix-seq_trace-reset_trace/OTP-15490: erts: Fix seq_trace:reset_trace dirty gc bug erts: Use sys_memcpy in copy_one_frag
2018-12-20Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/tls_connection.erl
2018-12-20Merge branch 'ingela/ssl/renegotiate-with-new-tls-sender/ERL-803/OTP-15489' ↵Ingela Anderton Andin
into maint * ingela/ssl/renegotiate-with-new-tls-sender/ERL-803/OTP-15489: ssl: Fix renegotiation with new TLS sender ssl: Add renegotiate test case
2018-12-19inet_db: fix a bug when .hosts file is never reloadedMaxim Fedorov
If .hosts file does not exist when kernel application starts, it will never get reloaded.
2018-12-19[socket-nif|test] Add more ttest (socket) test casesMicael Karlberg
Added a number of ttest test cases with transport socket. Server with transport = socket(tcp), active = true and client using transport = socket(tcp) (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (socket and gen_tcp) test casesMicael Karlberg
Added a number of ttest test cases with transport socket and gen_tcp. Server with transport = socket(tcp), active = true and client using transport = gen_tcp (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (socket) test casesMicael Karlberg
Added a number of ttest test cases with transport socket. Server with transport = socket(tcp), active = once and client using transport = socket(tcp) (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (socket and gen_tcp) test casesMicael Karlberg
Added a number of ttest test cases with transport socket and gen_tcp. Server with transport = socket(tcp), active = once and client using transport = gen_tcp (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (socket) test casesMicael Karlberg
Added a number of ttest test cases with transport socket. Server with transport = socket(tcp), active = false and client using transport = socket(tcp) (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (socket and gen_tcp) test casesMicael Karlberg
Added a number of ttest test cases with transport socket and gen_tcp. Server with transport = socket(tcp), active = false and client using transport = gen_tcp (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (gen_tcp and socket) test casesMicael Karlberg
Added a number of ttest test cases with transport gen_tcp and socket. Server with transport = gen_tcp, active = true and client using transport = socket(tcp) (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (gen_tcp) test casesMicael Karlberg
Added a number of ttest test cases with transport gen_tcp. Server with transport = gen_tcp, active = true and client using transport = gen_tcp (and active = false, once and true). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (gen_tcp and socket) test casesMicael Karlberg
Added a number of ttest test cases with transport gen_tcp and socket. Server with transport = gen_tcp, active = once and client using transport = socket(tcp) (and active = false, once and true). Also fixed a counting error in the server (forgot to include the header, 16 bytes, in the byte count). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (gen_tcp) test casesMicael Karlberg
Added a number of ttest test cases with transport gen_tcp. Server with transport = gen_tcp, active = once and client using transport = gen_tcp (and active = false, once and true). Also a bit of client and server cleanup (remove and cleanup up some printouts). OTP-14831
2018-12-19[socket-nif|test] Add more ttest (gen_tcp and socket) test casesMicael Karlberg
Added a number of ttest test cases with transport gen_tcp and socket. Server with transport = gen_tcp, active = false and client using transport = socket(tcp) (and active = false, once and true). Also a bit of "grouping". OTP-14831
2018-12-19Merge branch 'maint'Sverker Eriksson
* maint: Updated OTP version Prepare release
2018-12-19Merge tag 'OTP-20.2.0.1' into maintSverker Eriksson
=== OTP-20.2.0.1 === Changed Applications: - erts-9.2.0.1 Unchanged Applications: - asn1-5.0.4 - common_test-1.15.3 - compiler-7.1.4 - cosEvent-2.2.2 - cosEventDomain-1.2.2 - cosFileTransfer-1.2.2 - cosNotification-1.2.3 - cosProperty-1.2.3 - cosTime-1.2.3 - cosTransactions-1.3.3 - crypto-4.2 - debugger-4.2.4 - dialyzer-3.2.3 - diameter-2.1.3 - edoc-0.9.2 - eldap-1.2.3 - erl_docgen-0.7.2 - erl_interface-3.10.1 - et-1.6.1 - eunit-2.3.5 - hipe-3.17 - ic-4.4.3 - inets-6.4.5 - jinterface-1.8.1 - kernel-5.4.1 - megaco-3.18.3 - mnesia-4.15.2 - observer-2.6 - odbc-2.12.1 - orber-3.8.4 - os_mon-2.4.4 - otp_mibs-1.1.2 - parsetools-2.1.6 - public_key-1.5.2 - reltool-0.7.5 - runtime_tools-1.12.3 - sasl-3.1.1 - snmp-5.2.9 - ssh-4.6.3 - ssl-8.2.3 - stdlib-3.4.3 - syntax_tools-2.1.4 - tools-2.11.1 - wx-1.8.3 - xmerl-1.3.16 * tag 'OTP-20.2.0.1': Updated OTP version Prepare release
2018-12-19Updated OTP versionOTP-20.2.0.1Sverker Eriksson
2018-12-19Prepare releaseSverker Eriksson
2018-12-19Merge branch 'maint'Sverker Eriksson
2018-12-19Merge branch 'sverker/erl_child_setup/ERIERL-231/OTP-15488' into maintSverker Eriksson
DUMMY MERGE
2018-12-19ssl: Fix renegotiation with new TLS senderIngela Anderton Andin
Wtite connection state was not synchronized when peer initiated renegotiation
2018-12-19ssl: Add renegotiate test caseIngela Anderton Andin
2018-12-19Merge branch 'maint'Ingela Anderton Andin
2018-12-19Merge branch 'ingela/ssl/test-cuddle' into maintIngela Anderton Andin
* ingela/ssl/test-cuddle: ssl: Cuddle test cases
2018-12-19ssl: Cuddle test casesIngela Anderton Andin
Cipher test case also needed updating to handle streams correctly We should not rizzo test chacha20_poly1305 Conflicts: lib/ssl/test/ssl_basic_SUITE.erl
2018-12-19Observer: fix crash bug when expanding termkjnilsson
Observer makes use of cdv_html_wx but does not start cdv_wx first which made it crash when trying to send a message to cdv_wx. This fix avoids updating the status when the application using cdv_html_wx is cdv.
2018-12-19odbc: Fix stack corruption in get_diagnos in odbcserverJan Chochol
SQLGetDiagRec can fill output buffer and return SQL_SUCCESS_WITH_INFO. In that case we can not use strcat on diagnos.error_msg as it will write outside allocated space. Correctly set acc_errmsg_size in such case. See also ERL-808 at bugs.erlang.org.
2018-12-18Merge branch 'sverker/erl_child_setup/ERIERL-231/OTP-15488'Sverker Eriksson
* sverker/erl_child_setup/ERIERL-231/OTP-15488: Add assertions to forker and erl_child_setup
2018-12-18[socket-nif|test] Add more ttest (gen_tcp) test casesMicael Karlberg
Added a number of ttest test cases with transport gen_tcp. Server with transport = gen_tcp, active = false and client using transport = gen_tcp (and active = false, once and true). Also "fixed" the gen_tcp socket buffer size (default size was way to small for the "large" messages). OTP-14831
2018-12-18Merge branch 'maint'Sverker Eriksson
2018-12-18Merge branch 'sverker/big-band-bug/ERL-804/OTP-15487' into maintSverker Eriksson
* sverker/big-band-bug/ERL-804/OTP-15487: erts: Fix bug in 'band' of two negative numbers, one big
2018-12-18Merge branch 'sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486' into ↵Sverker Eriksson
maint * sverker/fix-atomics-get-large-unsigned/PR-2061/OTP-15486: erts: Fix possible heap corruption getting atomics
2018-12-18Merge branch 'sverker/erts/prim_file-perm-own-bigendian/OTP-15485' into maintSverker Eriksson
* sverker/erts/prim_file-perm-own-bigendian/OTP-15485: erts: Fix warning and potential big-endian-bug in prim_file
2018-12-18Make all compiler options work in the option listBjörn Gustavsson
Before OTP 22, the option `{nowarn_deprecated_function,MFAs}` was only recognized when given in the file with the attribute `-compile()`. (The option `{nowarn_unused_function,FAs}` was incorrectly documented to only work in a file, but it also worked when given in the option list.) Starting from OTP 22, all options that can be given in the file can also be given in the option list.
2018-12-18[socket-nif|test] Add test case based on the ttest modulesMicael Karlberg
Added a (first) test case based on the ttest modules. OTP-14831
2018-12-18Merge pull request #2053 from bjorng/bjorn/erts/trapping-length/OTP-15439Björn Gustavsson
Make length/1 yielding
2018-12-18Make length/1 yieldingBjörn Gustavsson
The guard BIF `length/1` would calculate the length of the list in one go without yielding, even if the list was were long. To make it even worse, the call to `length/1` would only cost a single reduction. This commit reimplements `length/1` so that it eats a number of reductions proportional to the length of the list, and yields if the available reductions run out.
2018-12-17Add assertions to forker and erl_child_setupSverker Eriksson
2018-12-17erts: Fix bug in 'band' of two negative numbers, one bigSverker Eriksson
Similar bug as for bxor fixed by abc4fd372d476821448dfb9 Ex: 1> io:format("~.16B\n", [-16#1110000000000000000 band (-1)]). -1120000000000000000 Wrong result for (-X bsl WS) band -Y. where X is any positive integer WS is erlang:system_info(wordsize)*8*N where N is 1 or larger Y is any positive integer smaller than (1 bsl WS) Fix: The subtraction of 1 (for 2-complement conversion) must be carried along all the way to the last words.
2018-12-17Use microops for BIFsMichał Muskała
This allows bif1/2/3 to share the main part of the code. The price is that we always need to copy all three temporary registers when error handling in bodies, but that should be infrequent. Additionally it makes it a bit harder to read the disasembly since now the arguments to BIFs are in the reverse order.
2018-12-17Merge pull request #2057 from michalmuskala/mm/missing-annoBjörn Gustavsson
Add missing annotations in instrs.tab
2018-12-17Merge branch 'raimo/stdlib/sys-log-of-gen-in-terminate-report/OTP-15381'Raimo Niskanen
* raimo/stdlib/sys-log-of-gen-in-terminate-report/OTP-15381: sys:log timeout 0 events Filter gen_server State in crash sys:log Fix statement duplication Document system_events better Adjust sys:log(N, get) to documentation Unify system_events in gen_* Log code change Use from/1 type check Limit more error_logger terms Add client stacktrace Print sys:log in error report Optimize sys:handle_debug/4 Optimize sys:log Fix sys:log functionality Conflicts: lib/stdlib/doc/src/sys.xml
2018-12-14Merge branch 'maint'Raimo Niskanen
Conflicts: lib/ssl/src/ssl_connection.hrl lib/ssl/src/tls_connection.erl
2018-12-14Merge branch 'raimo/ssl/tls_dist-optimization' into maintRaimo Niskanen
* raimo/ssl/tls_dist-optimization: Tighten dist app data receive
2018-12-14Merge branch 'bmk/20180918/nififying_inet_nif_comm/OTP-14831' into ↵Micael Karlberg
bmk/20180918/nififying_inet/OTP-14831
2018-12-14[socket-nif|test] Add a "global" loggerMicael Karlberg
Added a global logger that make it possible to log from the slave nodes (with "ease"). Also "fixed" the test case that failed on "older" linux (Ubuntu 14.04). For now we let it skip instead (we should really check the OS version). Also corrected a couple of (ping-pong) cases for which the buffer adjustments did not work. OTP-14831
2018-12-14[socket-nif|test] Correct the (api) connect timeout test caseMicael Karlberg
Assumed the wrong success value ({ok, _} instead of ok) for the api-to-connect-tcp test case. OTP-14831
2018-12-14[socket-nif] Message interface between socket.erl and nif updatedMicael Karlberg
Previously the "message interface" between the functions in socket.erl and the nif-code (socket_nif.c) was "ad hoc". This has now been changed so that we have a unified message {'$socket', SockRef | undefined, Tag, Info} This also has the added advantage of preparing the code for when we start using the new select-fucntions (with which its possible to specify your own message). This will be used in order to get around our eterm "leak" (we will use a simple counter, maintained in the nif, instead of the [Recv|Send|Acc]Ref we generate in the erlang code today. OTP-14831
2018-12-14Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/ssl_connection.hrl lib/ssl/src/tls_connection.erl lib/ssl/src/tls_record.erl