aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-10-11Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release
2018-10-11Merge branch 'maint-17' into maintRickard Green
* maint-17: Updated OTP version Prepare release
2018-10-11Updated OTP versionOTP-17.5.6.10maint-17Erlang/OTP
2018-10-11Prepare releaseErlang/OTP
2018-10-11Merge branch 'sverker/r16/binary_to_atom-utf8-crash/ERL-474/OTP-14590' into ↵Erlang/OTP
maint-17 * sverker/r16/binary_to_atom-utf8-crash/ERL-474/OTP-14590: erts: Fix crash in binary_to_atom/term for invalid utf8
2018-10-11Merge branch 'sverker/big-bxor-bug/ERL-450/OTP-14514' into maint-17Erlang/OTP
* sverker/big-bxor-bug/ERL-450/OTP-14514: erts: Fix bug in bxor of a big negative number
2018-10-11Merge branch 'sverker/bin2term-zlib-bug/ERL-340/OTP-14159' into maint-17Erlang/OTP
* sverker/bin2term-zlib-bug/ERL-340/OTP-14159: erts: Fix binary_to_term for compressed and zlib >= v1.2.9
2018-10-11Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maint-17Erlang/OTP
* rickard/thr-prgr-unmanaged-delay-bug/OTP-13869: Fix erts_thr_progress_unmanaged_delay()
2018-10-11Merge branch 'rickard/drv-send-term-thr-bug/OTP-13866' into maint-17Erlang/OTP
* rickard/drv-send-term-thr-bug/OTP-13866: Fix thread calls to erl_drv_send_term()/erl_drv_output_term()
2018-10-11Merge branch 'rickard/port-sig-dropped-fix/OTP-13424' into maint-17Erlang/OTP
* rickard/port-sig-dropped-fix/OTP-13424: Fix implementation of dropped signal to port
2018-10-11Merge branch 'maint'Hans Nilsson
* maint: crypto: Update RSA tests after algorithms doc chapter crypto: Update RSA options to match specs and different OpenSSL versions - Put rsa_pkcs1_oaep_padding in supports/0 - #ifdef updates - Refine PKCS1_OAEP defines
2018-10-11Merge branch 'hans/crypto/fix_RSA_opts/OTP-15302' into maintHans Nilsson
* hans/crypto/fix_RSA_opts/OTP-15302: crypto: Update RSA tests after algorithms doc chapter crypto: Update RSA options to match specs and different OpenSSL versions - Put rsa_pkcs1_oaep_padding in supports/0 - #ifdef updates - Refine PKCS1_OAEP defines
2018-10-11crypto: Update RSA tests after algorithms doc chapterHans Nilsson
2018-10-11crypto: Update RSA options to match specs and different OpenSSL versionsHans Nilsson
- Put rsa_pkcs1_oaep_padding in supports/0 - #ifdef updates - Refine PKCS1_OAEP defines
2018-10-11Merge branch 'maint'Dan Gudmundsson
* maint: Run emacs tests from test_suite Emacs: consider case in erlang-get-identifier-at-point Emacs: do not accept compiler warnings in selected elisp files Emacs: add test-erlang-mode
2018-10-11Merge branch 'pr/1949' into maintDan Gudmundsson
* pr/1949: Run emacs tests from test_suite Emacs: consider case in erlang-get-identifier-at-point Emacs: do not accept compiler warnings in selected elisp files Emacs: add test-erlang-mode
2018-10-11Merge branch 'maint'Ingela Anderton Andin
2018-10-11Merge branch 'ingela/ssl/merge-fix' into maintIngela Anderton Andin
* ingela/ssl/merge-fix: ssl: Fix up incorrect automatic merge
2018-10-11ssl: Fix up incorrect automatic mergeIngela Anderton Andin
2018-10-11Merge branch 'maint'Ingela Anderton Andin
2018-10-11Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into ↵Ingela Anderton Andin
maint Conflicts: lib/ssl/src/tls_sender.erl
2018-10-11Merge branch 'dgud/stdlib/unicode-11/OTP-15111'Dan Gudmundsson
* dgud/stdlib/unicode-11/OTP-15111: Update to Unicode-11
2018-10-11ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin
If the socket option is set to {packet, 1|2|3|4} sender process needs to add a packet length header. If packet is changed with ssl:setopts/2 this needs to be communicated to tls_sender.
2018-10-11Merge branch 'maint'Ingela Anderton Andin
2018-10-11Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into ↵Ingela Anderton Andin
maint
2018-10-11Merge branch 'ingela/maint/ssl/close-alert-ERL-738/OTP-15337' into maintIngela Anderton Andin
2018-10-11Merge pull request #1969 from RaimoNiskanen/raimo/stdlib/rand-xorshift116ssRaimo Niskanen
OTP-14731 Implement 'exsss' (Xorshift116**) as new default 'rand' algorithm The new algorithm is a combination of the Xorshift116 ('exsp') state update and a new scrambler "StarStar" from the 2018 paper "Scrambled Linear Pseudorandom Number Generators" by David Blackman and Sebastiano Vigna. This combination should not have the caveat of weak low bits that the previous default algorithm(s) have had, with the cost of about 10% lower speed.
2018-10-11Merge branch 'maint'Ingela Anderton Andin
2018-10-11Merge branch 'ingela/ssl/packet-options-to-tls-sender/OTP-15348' into maintIngela Anderton Andin
* ingela/ssl/packet-options-to-tls-sender/OTP-15348: ssl: TLS sender process needs to get updates of the socket option packet
2018-10-10ssl: ERL-738 - Correct alert handling with new TLS sender processIngela Anderton Andin
With the new TLS sender process, solving ERL-622, TLS ALERTs sent in the connection state must be encrypted and sent by the TLS sender process. This to make sure that the correct encryption state is used to encode the ALERTS. Care must also be taken to ensure a graceful close down behavior both for normal shutdown and downgrading from TLS to TCP. The original TR ERL-738 is verified by cowboy tests, and close down behavior by our tests. However we alas have not been able to yet create a minimal test case for the originating problem. Also it seems it has become less likely that we run in to the TCP delivery problem, that is the guarantee is only on transport level, not application level. Keep work around function in ssl_test_lib but we can have better test as long as we do not get to much wobbling tests.
2018-10-10ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin
If the socket option is set to {packet, 1|2|3|4} sender process needs to add a packet length header. If packet is changed with ssl:setopts/2 this needs to be communicated to tls_sender.
2018-10-10ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin
If the socket option is set to {packet, 1|2|3|4} sender process needs to add a packet length header. If packet is changed with ssl:setopts/2 this needs to be communicated to tls_sender.
2018-10-09Merge branch 'sverker/erts/erts-fix-merge-commit'Sverker Eriksson
* sverker/erts/erts-fix-merge-commit: erts: Fix bug introduced in merge commit
2018-10-09erts: Fix bug introduced in merge commitSverker Eriksson
f4f409ff28185b3308359ca5ca91921bc51f536f
2018-10-09Merge branch 'maint'Sverker Eriksson
# Conflicts: # erts/emulator/beam/erl_db_tree.c
2018-10-09Merge branch 'sverker/erts/ets-select_replace-bug/OTP-15346' into maintSverker Eriksson
* sverker/erts/ets-select_replace-bug/OTP-15346: erts: Fix bug in ets:select_replace for bound key
2018-10-09erts: Fix bug in ets:select_replace for bound keySverker Eriksson
which may cause following calls to ets:next or ets:prev to fail.
2018-10-09Run emacs tests from test_suiteDan Gudmundsson
Drive emacs test from test_suite instead of bash script.
2018-10-09Emacs: consider case in erlang-get-identifier-at-pointJohan Claesson
2018-10-09Emacs: do not accept compiler warnings in selected elisp filesJohan Claesson
2018-10-09Emacs: add test-erlang-modeJohan Claesson
2018-10-08Merge branch 'sverker/erts/freeing-ordered_set-nodes/OTP-15323'Sverker Eriksson
* origin/sverker/erts/freeing-ordered_set-nodes/OTP-15323: erts: Refactor out DbRouteKey struct erts: Remove dead code in erl_db_catree erts: Fix bug in erl_db_catree erts: Remove "dynamic" lock order support erts: Add lock order check for route nodes erts: Add lock order check of erl_db_catree base nodes erts: Add Erlang term order to lock checker erts: Add some ERTS_RESTRICT pointers erts: Do some refactoring in erl_db_catree.c erts: Improve deallocation of CATree nodes erts: Refactor rename union in DbTableCATreeNode erts: Fix compiler warning in erl_bif_binary.c
2018-10-08Merge branch 'maint'Péter Dimitrov
* maint: inets: Fix handling of 'Content-Type' (httpc) inets: Fix handling of 'Content-Length' (httpc) Change-Id: I3c8b4ef664d1888efb87d7799365df66eb4b2ff3
2018-10-08Merge branch 'peterdmv/inets/httpc-content-type/ERL-736/OTP-15339' into maintPéter Dimitrov
* peterdmv/inets/httpc-content-type/ERL-736/OTP-15339: inets: Fix handling of 'Content-Type' (httpc) Change-Id: I8c9f48d8474dba7a83e4ecba6b8146faffb559fc
2018-10-08Merge branch 'peterdmv/inets/httpc-content-length/ERL-733/OTP-15338' into maintPéter Dimitrov
* peterdmv/inets/httpc-content-length/ERL-733/OTP-15338: inets: Fix handling of 'Content-Length' (httpc) Change-Id: I3281949d47d2494dc8d6f3af3e93b46cdbbc24b9
2018-10-08Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
2018-10-08Merge branch 'ingela/ssl/close-alert-ERL-738/OTP-15337' into maintIngela Anderton Andin
* ingela/ssl/close-alert-ERL-738/OTP-15337: ssl: ERL-738 - Correct alert handling with new TLS sender process
2018-10-08ssl: ERL-738 - Correct alert handling with new TLS sender processIngela Anderton Andin
With the new TLS sender process, solving ERL-622, TLS ALERTs sent in the connection state must be encrypted and sent by the TLS sender process. This to make sure that the correct encryption state is used to encode the ALERTS. Care must also be taken to ensure a graceful close down behavior both for normal shutdown and downgrading from TLS to TCP. The original TR ERL-738 is verified by cowboy tests, and close down behavior by our tests. However we alas have not been able to yet create a minimal test case for the originating problem. Also it seems it has become less likely that we run in to the TCP delivery problem, that is the guarantee is only on transport level, not application level. Keep work around function in ssl_test_lib but we can have better test as long as we do not get to much wobbling tests.
2018-10-08Merge pull request #1964 from lemenkov/more_os_getenv_2Hans Bolinder
Use os:getenv/2 where possible
2018-10-08Merge branch 'maint'John Högberg
* maint: compiler: Forward +source flag to epp and fix bug in +deterministic epp: Allow user to set source name independently of input file name
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-20 10:03:38 +0000