summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rickard/megaco-appup' into maint-24Erlang/OTP2021-05-201-2/+4
|\ | | | | | | | | * rickard/megaco-appup: Update megaco.appup
| * Update megaco.appupRickard Green2021-05-201-2/+4
| |
* | Merge branch 'dgud/wx/fix-build-std/GH-4834/OTP-17407' into maint-24Erlang/OTP2021-05-202-3/+33
|\ \ | | | | | | | | | | | | * dgud/wx/fix-build-std/GH-4834/OTP-17407: wx: Fix compile error
| * | wx: Fix compile errorDan Gudmundsson2021-05-172-3/+33
| |/ | | | | | | | | | | Make it compile when wxWidgets is built with "-enable-std". Fixes GH-4834
* | Merge branch 'rickard/ded_ldflags_conftest/OTP-17419' into maint-24Erlang/OTP2021-05-206-68/+64
|\ \ | | | | | | | | | | | | | | | * rickard/ded_ldflags_conftest/OTP-17419: Update configure scripts Document and fix DED_LDFLAGS_CONFTEST
| * | Update configure scriptsRickard Green2021-05-193-6/+6
| | |
| * | Document and fix DED_LDFLAGS_CONFTESTRickard Green2021-05-193-62/+58
| | |
* | | Merge branch 'rickard/configure/24/OTP-17420' into maint-24Erlang/OTP2021-05-2026-15/+99780
|\ \ \ | |/ / | | | | | | | | | | | | * rickard/configure/24/OTP-17420: Update configure scripts Adjustment for github actions
| * | Update configure scriptsRickard Green2021-05-1925-0/+99760
| | |
| * | Adjustment for github actionsRickard Green2021-05-191-15/+20
| | |
* | | Merge branch 'rickard/configure/24/OTP-17398' into maint-24Erlang/OTP2021-05-2010-149/+147
|\ \ \ | |/ / | | | | | | | | | * rickard/configure/24/OTP-17398: Support for committing of configure scripts
| * | Merge 'rickard/configure/23/OTP-17398' into rickard/configure/24/OTP-17398Rickard Green2021-05-1910-149/+147
| |\ \ | | |/ | |/| | | | | | | * rickard/configure/OTP-17398: Support for committing of configure scripts
| | * Merge 'rickard/configure/OTP-17398' into rickard/configure/23/OTP-17398Rickard Green2021-05-1910-148/+147
| | |\ | | | | | | | | | | | | | | | | * rickard/configure/OTP-17398: Support for committing of configure scripts
| | | * Support for committing of configure scriptsRickard Green2021-05-198-139/+140
| | | |
* | | | Merge branch 'hans/crypto/fix_coredump/GH-4810/OTP-17391' into maint-24Erlang/OTP2021-05-202-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * hans/crypto/fix_coredump/GH-4810/OTP-17391: crypto: Test fixed coredump if bad enc-flag crypto: Fixed coredump if bad enc-flag
| * | | | crypto: Test fixed coredump if bad enc-flagHans Nilsson2021-05-191-0/+12
| | | | |
| * | | | crypto: Fixed coredump if bad enc-flagHans Nilsson2021-05-191-1/+0
| | |/ / | |/| |
* | | | Merge branch 'hans/ssh/add_missing_to_ssh_file/OTP-17397' into maint-24Erlang/OTP2021-05-202-56/+119
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * hans/ssh/add_missing_to_ssh_file/OTP-17397: ssh: Accept \r\n as well as \n as line end ssh: ssh_file:encode/decode of known_host and authorized_keys files
| * | | ssh: Accept \r\n as well as \n as line endHans Nilsson2021-05-191-2/+2
| | | |
| * | | ssh: ssh_file:encode/decode of known_host and authorized_keys filesHans Nilsson2021-05-192-56/+119
|/ / /
* | | Updated OTP versionOTP-24.0Erlang/OTP2021-05-102-1/+2
| | |
* | | Prepare releaseErlang/OTP2021-05-1094-218/+3349
| | |
* | | Merge branch 'maint'John Högberg2021-05-107-3/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION
| * \ \ Merge branch 'maint-23' into maintJohn Högberg2021-05-109-4/+69
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-23: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | Updated OTP versionOTP-23.3.4Erlang/OTP2021-05-102-1/+2
| | | |
| | * | Prepare releaseErlang/OTP2021-05-107-8/+66
| | | |
| | * | Merge branch 'anders/diameter/sctp/OTP-17366' into maint-23Erlang/OTP2021-05-107-27/+37
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * anders/diameter/sctp/OTP-17366: Fix appup blunder Add appup Suppress dialyzer warnings in code Fix association id of unordered send setopts in diameter_sctp Fix ignored unordered option on client diameter_sctp transport
| | * \ \ Merge branch 'sverker/23/ets-matchspec-stack-bug/OTP-17379' into maint-23Erlang/OTP2021-05-102-3/+38
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * sverker/23/ets-matchspec-stack-bug/OTP-17379: erts: Fix matchspec stack depth estimation bug
| | * \ \ \ Merge branch ↵Erlang/OTP2021-05-102-36/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'john/compiler/revert-container-type-subtraction/ERIERL-650/OTP-17386' into maint-23 * john/compiler/revert-container-type-subtraction/ERIERL-650/OTP-17386: Revert "Merge branch 'john/compiler/validator-container-type-subtraction/GH-4774/OTP-17357' into maint-23"
* | | \ \ \ \ Merge branch 'raimo/cuddle-tests'Raimo Niskanen2021-05-101-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * raimo/cuddle-tests: Improve read_packets_verify failure
| * | | | | | | Improve read_packets_verify failureRaimo Niskanen2021-05-071-0/+4
| | | | | | | |
* | | | | | | | Merge branch 'maint'Anders Svensson2021-05-101-8/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'anders/diameter/sctp/OTP-17366' into maintAnders Svensson2021-05-101-8/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * anders/diameter/sctp/OTP-17366: Fix appup blunder
| | * | | | | | Fix appup blunderAnders Svensson2021-05-101-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler modules aren't included in the app file since they're typically not used at runtime.
* | | | | | | | Merge branch 'maint'Anders Svensson2021-05-087-27/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'anders/diameter/sctp/OTP-17366' into maintAnders Svensson2021-05-087-27/+43
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * anders/diameter/sctp/OTP-17366: Add appup Suppress dialyzer warnings in code Fix association id of unordered send setopts in diameter_sctp Fix ignored unordered option on client diameter_sctp transport
| | * | | | | Add appupAnders Svensson2021-05-071-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't include modules that have just added dialyzer or compile attributes: diameter_traffic, diameter_tcp, and all the diameter_gen*.
| | * | | | | Suppress dialyzer warnings in codeAnders Svensson2021-05-074-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of assuming that dialyzer is run with non-default options and omitted dictionary modules. The dialyzer attribute is documented in dialyzer(3). Also suppress a compiler warning on unused functions in generated dictionary modules. Compiler options as attributes are documented in compile(3).
| | * | | | | Fix association id of unordered send setopts in diameter_sctpAnders Svensson2021-05-041-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to inet:setopts/2 to request unordered delivery did not set assoc_id, and gen_sctp(3) documents the default 0 in this case as meaning the whole endpoint, which was not the intention. The result was either too much unordered or too little, depending on the use case, but exactly what the behaviour is on different OSes is a little unclear. What's clear is that it was wrong. RFC 6458 defines constants SCTP_FUTURE_ASSOC, SCTP_CURRENT_ASSOC, and SCTP_ALL_ASSOC here: https://tools.ietf.org/html/rfc6458#section-7.2 It doesn't assign numeric values however, so 0 in gen_sctp doesn't necessarily have the same meaning as the 0 that Linux (for one) defines as SCTP_FUTURE_ASSOC for example. Besides, association ids are documented as opaque by gen_sctp(3), so even setting 0 explicitly is questionable. Better to simply specify the association id that gen_sctp has communicated in the sctp_assoc_change comm_up event. Last visited in commit d3829525. Originally bungled in commit 0447bd6e. Thanks to Andreas Schultz.
| | * | | | | Fix ignored unordered option on client diameter_sctp transportAnders Svensson2021-04-302-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option was ignored, causing all sending to be ordered. Thanks to Bengt Kleberg.
* | | | | | | Merge branch 'maint'John Högberg2021-05-072-36/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * maint: Revert "Merge branch 'john/compiler/validator-container-type-subtraction/GH-4774/OTP-17357' into maint-23"
| * | | | | | Merge branch ↵John Högberg2021-05-072-36/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'john/compiler/revert-container-type-subtraction/ERIERL-650/OTP-17386' into maint * john/compiler/revert-container-type-subtraction/ERIERL-650/OTP-17386: Revert "Merge branch 'john/compiler/validator-container-type-subtraction/GH-4774/OTP-17357' into maint-23"
| | * | | | | Revert "Merge branch ↵John Högberg2021-05-072-36/+7
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'john/compiler/validator-container-type-subtraction/GH-4774/OTP-17357' into maint-23" This reverts commit d9d9108e249694b053071f98f08bc96e5e48894f, reversing changes made to 0f6a7b2f6899ed2ad6bedcd36e41ed42a49edca4.
* | | | | | Merge branch 'maint'Sverker Eriksson2021-05-072-3/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'sverker/23/ets-matchspec-stack-bug/OTP-17379' into maintSverker Eriksson2021-05-072-3/+38
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge 'sverker/22/ets-matchspec-stack-bug/OTP-17379'Sverker Eriksson2021-05-062-3/+38
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | forward to OTP-23.3.1 as 'sverker/23/ets-matchspec-stack-bug/OTP-17379'
| | | * \ \ \ Merge 'sverker/21/ets-matchspec-stack-bug/OTP-17379'Sverker Eriksson2021-05-062-3/+38
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | forward to OTP-22.3.4 as 'sverker/22/ets-matchspec-stack-bug/OTP-17379'
| | | | * | | erts: Fix matchspec stack depth estimation bugSverker Eriksson2021-05-062-3/+38
| | | | | | |
* | | | | | | Merge pull request #4805 from ↵Ingela Andin2021-05-074-10/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IngelaAndin/ingela/ssl/public_key/cert-doc-log-enhancment/GH-4800/OTP-17384 Ingela/ssl/public key/cert doc log enhancment/gh 4800/otp 17384
| * | | | | | | ssl: Enhance doc and logging of certificate handlingIngela Anderton Andin2021-05-063-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4800