aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-01-09ssl: Fix srp testcase faultPéter Dimitrov
Fix testcase fault introduced by the forward merge of peterdmv/ssl/fix-srp-encode-decode/ERL-790/OTP-15477. Change-Id: Ia4290265d5c59b6d50f4e5b60b41d5f05fd14278
2019-01-08Merge branch 'maint'Péter Dimitrov
* maint: ssl: Fix encoding/decoding of the SRP extension Change-Id: I3b5887cf01b1a538c65d0c66da4d4ccf7793478d
2019-01-08Merge branch 'peterdmv/ssl/fix-srp-encode-decode/ERL-790/OTP-15477' into maintPéter Dimitrov
* peterdmv/ssl/fix-srp-encode-decode/ERL-790/OTP-15477: ssl: Fix encoding/decoding of the SRP extension Change-Id: Iee3276a60041a2c04c89385b2de2edb1cd81babd
2019-01-08Merge branch 'maint'Ingela Anderton Andin
2019-01-08Merge pull request #2070 from essen/fix-ssl-shutdown-crashIngela Andin
ssl: Fix two invalid gen_statem returns OTP-15505
2019-01-08ssl: Fix encoding/decoding of the SRP extensionPéter Dimitrov
The encoded value of the SRP extension length was bigger than the actual length of the extension. This could cause interoperability problems with third party SSL implementations. This commit corrects the encoding and decoding of the SRP extension length. Change-Id: I78d118faab7f5d02b755a7d1e2e8561b86f5a15c
2019-01-08Merge branch 'maint'Ingela Anderton Andin
2019-01-08Merge branch 'ingela/maint-21/active-once/ERL-371/OTP-15504' into maintIngela Anderton Andin
* ingela/maint-21/active-once/ERL-371/OTP-15504: ssl: Guarantee active once data delivery
2019-01-08ssl: Guarantee active once data deliveryIngela Anderton Andin
New internal active N changed timing, and new check is needed.
2019-01-08Merge pull request #2065 from janchochol/fix-get_diagnos-odbcserverIngela Andin
odbc: Fix stack corruption in get_diagnos in odbcserver
2019-01-08Merge branch 'maint'Lars Thorsen
* maint: Updated OTP version Prepare release
2019-01-08Merge branch 'maint-20' into maintLars Thorsen
* maint-20: Updated OTP version Prepare release
2019-01-08Merge branch 'maint'Lars Thorsen
* maint: [xmerl] Fix detect charset crash [cdv] Check only own persistent terms in crashdump_viewer test Fix remote-call error in ms_transform Conflicts: lib/observer/test/crashdump_helper.erl
2019-01-08Merge branch 'lars/xmerl/bug-in-detect-charset/OTP-15492' into maintLars Thorsen
* lars/xmerl/bug-in-detect-charset/OTP-15492: [xmerl] Fix detect charset crash
2019-01-08Merge branch 'siri/cuddle' into maintSiri Hansen
* siri/cuddle: [cdv] Check only own persistent terms in crashdump_viewer test
2019-01-08Merge pull request #2022 from gomoripeti/ms_remote_call_errorSiri Hansen
Fix remote-call error in ms_transform
2019-01-08Merge branch 'maint'Ingela Anderton Andin
2019-01-08Merge pull request #2076 from IngelaAndin/ingela/ssl/active-once/ERL-371Ingela Andin
ssl: Guarantee active once data delivery OTP-15504
2019-01-07Merge PR-2084 from sverker/erts/enif_select-custom-msg OTP-15349Sverker Eriksson
Custom message format for enif_select
2019-01-07Merge branch 'maint'Lukas Larsson
2019-01-07Merge branch 'lukas/erts/persistent_term_test_fix' into maintLukas Larsson
* lukas/erts/persistent_term_test_fix: erts: Fix persistent_term testcases
2019-01-07erts: Add enif_select_read|write with 'msg_env' argumentSverker Eriksson
2019-01-07Merge branch 'maint'Björn Gustavsson
* maint: Remove unsafe optimization for delaying creation of stackframe Conflicts: lib/compiler/src/v3_codegen.erl
2019-01-07Merge branch 'bjorn/compiler/interim-tuple-bug/OTP-15501/ERL-807' into maintBjörn Gustavsson
* bjorn/compiler/interim-tuple-bug/OTP-15501/ERL-807: Remove unsafe optimization for delaying creation of stackframe
2019-01-07Merge branch 'maint'Hans Nilsson
* maint: ssh: Wait a bit for the docker client to finnish in ssh_compat_SUITE
2019-01-07Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: Wait a bit for the docker client to finnish in ssh_compat_SUITE
2019-01-07Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_handshake.erl
2019-01-07ssh: Wait a bit for the docker client to finnish in ssh_compat_SUITEHans Nilsson
The testing with a remote client in a docker and a local server could show some hazards. For instance instructing the client to sftp a file to the server is not necessarily ready in the server's file system when the common_test is scheduled. To avoid that the test suite dooms a file operation to not have been performed, simply sleep at increasing times for a while with testing if it is done. After a while give up and signal a fault.
2019-01-07Merge pull request #2063 from bjorng/bjorn/compiler/options/OTP-15456Björn Gustavsson
Make all compiler options work in the option list
2019-01-07Merge branch 'ingela/ssl/error-handling-should-be-throw/OTP-15502' into maintIngela Anderton Andin
* ingela/ssl/error-handling-should-be-throw/OTP-15502: ssl: Clean up extension handling
2019-01-07Merge pull request #2059 from michalmuskala/mm/bif-microopsBjörn Gustavsson
Use microops for BIFs
2019-01-07Updated OTP versionOTP-20.3.8.17Erlang/OTP
2019-01-07Prepare releaseErlang/OTP
2019-01-07Merge branch 'lars/xmerl/bug-in-detect-charset/OTP-15492' into maint-20Erlang/OTP
* lars/xmerl/bug-in-detect-charset/OTP-15492: [xmerl] Fix detect charset crash
2019-01-07[xmerl] Fix detect charset crashLars Thorsen
The charset detection parsing crash in some cases when the XML directive is not syntactic correct.
2019-01-07Remove unsafe optimization for delaying creation of stackframeBjörn Gustavsson
b89044a800c4 introduced an optimization that tries to delay creation of stack frames. It turns out that this optimization is not always safe. (See the new test case for an example.) Since the code generator is completely rewritten in the `master` branch for the upcoming OTP 22 release, it does not make sense trying to mend this optimization. It is better to remove it. Out of a sample of about 1000 modules in OTP, about 50 of them are changed as a result of removing this optimization. The compiler in OTP 22 will do the same optimization in a cleaner, safer, and more effective way. https://bugs.erlang.org/browse/ERL-807
2019-01-07Merge branch 'maint'Hans Nilsson
* maint: Fix sftpd interop for SSH_FXP_STAT
2019-01-07Merge pull request #2077 from KryoStoffer/maintHans Nilsson
ERL-822 Fix sftpd interop for SSH_FXP_STAT OTP-15498
2019-01-04Fix sftpd interop for SSH_FXP_STATKristoffer Larsen
Some SFTP client's have been discover to claim one version of the protocol and send messages in a different version. In the spirit of Postel's law, we can for SSH_FXP_STAT, ignore the differences in the protocol, as we are not doing anything with the flags anyway.
2019-01-03Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release
2019-01-03Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release
2019-01-02Merge branch 'hans/crypto/Makefile_fixes/OTP-14732'Hans Nilsson
* hans/crypto/Makefile_fixes/OTP-14732: crypto: Fix 'make clean'
2019-01-02crypto: Fix 'make clean'Hans Nilsson
2019-01-02Merge pull request #2068 from hogand/crypto/split-c-filesHans Nilsson
crypto: Split up crypto.c into multiple files OTP-14732
2018-12-28Updated OTP versionOTP-20.3.8.16Erlang/OTP
2018-12-28Prepare releaseErlang/OTP
2018-12-28Merge branch 'hans/ssh/port_leak/OTP-15397' into maint-20Erlang/OTP
* hans/ssh/port_leak/OTP-15397: ssh: Fix port leakage for daemons failing at start ssh: Add port close test
2018-12-28Merge branch 'sverker/big-band-bug/ERL-804/OTP-15487' into maint-20Erlang/OTP
* sverker/big-band-bug/ERL-804/OTP-15487: erts: Fix bug in 'band' of two negative numbers, one big
2018-12-28Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssh: Fix port leakage for daemons failing at start ssh: Add port close test
2018-12-28Merge branch 'maint-21' into maintHans Nilsson
* maint-21: Updated OTP version Prepare release ssh: Fix port leakage for daemons failing at start ssh: Add port close test
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 21:22:24 +0000