summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sverker/crypto/libre-ssl-fixing/OTP-18571' into maintSverker Eriksson2023-05-021-0/+9
|\
| * crypto: Fix cmac_update aes_128_cbc for LibreSSLSverker Eriksson2023-04-251-0/+9
* | Merge branch 'bjorn/compiler/beam_validator/25/GH-7147/OTP-18565' into maintBjörn Gustavsson2023-05-024-9/+110
|\ \
| * | Fix two type-related bugsBjörn Gustavsson2023-05-024-9/+110
| |/
* | Merge branch 'maint-25' into maintJakub Witczak2023-04-2748-43/+215
|\ \
| * | Prepare releaseErlang/OTP2023-04-2520-14/+186
| * | Update copyright yearErlang/OTP2023-04-2531-31/+31
| * | Merge branch 'dgud/wx/fix-debug/OTP-18512' into maint-25Erlang/OTP2023-04-2531-2625/+2911
| |\ \
| * \ \ Merge branch 'kuba/maint-24/inets/fix_httpc_remote_socket_close/OTP-18545' in...Erlang/OTP2023-04-251-8/+18
| |\ \ \
| * \ \ \ Merge branch 'kuba/crypto/fix_len_var_type/OTP-18555' into maint-25Erlang/OTP2023-04-251-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'john/erts/fix-ic-dc-config-test/OTP-18554' into maint-25Erlang/OTP2023-04-251-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'kuba/ssl/kuba/ssl/keylog_fix/OTP-18489' into maint-25Erlang/OTP2023-04-253-56/+94
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ingela/ssl/test-stop-using-weak-key' into maint-25Erlang/OTP2023-04-251-7/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ingela/ssl/correct-sigalg-order/OTP-18550' into maint-25Erlang/OTP2023-04-252-4/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-hd-tl-loader-transformations/GH-7024/OTP-18519' i...Erlang/OTP2023-04-251-2/+26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ingela/eldap/ssl-connection-information/OTP-18480' into maint-25Erlang/OTP2023-04-253-5/+69
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'john/compiler/fix-inert-update-type/GH-6969/OTP-18516' into mai...Erlang/OTP2023-04-252-2/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bjorn/stdlib/erl_parse/GH-6956/OTP-18506' into maint-25Erlang/OTP2023-04-251-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/inets/httpc/maint-25/queue-bug/OTP-18509' into maint-25Erlang/OTP2023-04-251-9/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | inets: httpc - fix pipeline and keepalive queue bugIngela Anderton Andin2023-03-131-9/+11
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'bjorn/compiler/fix-lost-map-exception/GH-6960/OTP-18497' into m...Erlang/OTP2023-04-252-17/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bmk/snmp/agent/20230127/minimize_error_reporting_during_failed_...Erlang/OTP2023-04-258-67/+202
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ingela/eldap/ssl-connection-information/OTP-18480' into maintIngela Anderton Andin2023-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | eldap:Fix since tagIngela Anderton Andin2023-04-251-1/+1
| * | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-1/+1
| * | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-1/+1
| * | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-1/+1
| * | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-5/+6
| * | | | | | | | | | | | | | Update eldap:info/1 documentationanupamasingh102023-04-251-4/+5
| * | | | | | | | | | | | | | Add new api eldap:info/1anupamasingh102023-04-254-67/+24
| * | | | | | | | | | | | | | Add new api conn_info for SSL connections to LDAP serveranupamasingh102023-04-252-7/+9
| * | | | | | | | | | | | | | Add new api conn_info for SSL connections to LDAP serveranupamasingh102023-04-253-4/+107
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'dgud/wx/fix-debug/OTP-18512' into maintDan Gudmundsson2023-04-2531-2625/+2911
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | wx: Use temp env for send_msgDan Gudmundsson2023-04-241-0/+3
| * | | | | | | | | | | | | gl: Fix glDebugMessage functionalityDan Gudmundsson2023-04-248-64/+117
| * | | | | | | | | | | | | Fix testsDan Gudmundsson2023-04-241-4/+7
| * | | | | | | | | | | | | Fix wx-3.2 macros and OpenGL supportDan Gudmundsson2023-04-2414-2542/+2703
| * | | | | | | | | | | | | wx: Add debug printouts for OpenGLDan Gudmundsson2023-04-028-27/+71
| * | | | | | | | | | | | | wx: Improve debug printoutsDan Gudmundsson2023-03-143-9/+31
* | | | | | | | | | | | | | Merge branch 'maint-24' into maintJakub Witczak2023-04-214-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Prepare releaseErlang/OTP2023-04-204-3/+38
| * | | | | | | | | | | | | | Update copyright yearErlang/OTP2023-04-203-3/+3
| * | | | | | | | | | | | | | Merge branch 'kuba/maint-24/inets/fix_httpc_remote_socket_close/OTP-18545' in...Erlang/OTP2023-04-201-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | inets: httpc fix for socket closingJakub Witczak2023-04-181-8/+18
| * | | | | | | | | | | | | | Merge branch 'ingela/ssl/test-stop-using-weak-key' into maint-24Erlang/OTP2023-04-201-7/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'ingela/maint-24/correct-sigalg-order/OTP-18550' into maint-24Erlang/OTP2023-04-202-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | ssl: Honor signatur alogithm input orderIngela Anderton Andin2023-04-062-4/+9
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'u3s_github/kuba/crypto/fix_len_var_type/OTP-185...Jakub Witczak2023-04-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | crypto: dh.c change len type to ErlNifUInt64Jakub Witczak2023-04-171-2/+2
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ingela/ssl/test-stop-using-weak-key' into maintIngela Anderton Andin2023-04-201-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |