aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-05-21Merge branch 'maint'Sverker Eriksson
2019-05-21Merge branch 'sverker/erts/socket-leak-fix/OTP-15830' into maintSverker Eriksson
* sverker/erts/socket-leak-fix: erts: Fix memory leaks in socket_nif erts: Fix dealloction bug in socket_nif
2019-05-20Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION
2019-05-20Merge branch 'maint-22' into maintIngela Anderton Andin
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-05-20Merge branch 'maint'Lars Thorsen
* maint: Updated OTP version Prepare release
2019-05-20Merge branch 'maint-21' into maintLars Thorsen
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # lib/xmerl/doc/src/notes.xml # lib/xmerl/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-05-20Merge branch 'maint'Lars Thorsen
2019-05-20Merge branch 'lars/fix-sax-parser-bug-during-check-encoding/OTP-15826' into ↵Lars Thorsen
maint * lars/fix-sax-parser-bug-during-check-encoding/OTP-15826: [xmerl] Fix parse bug when checking the character encoding
2019-05-20Merge branch 'maint'Lukas Larsson
* maint: fix typo in gen_statem.xml Update erlang.xml
2019-05-15Merge pull request #2225 from juise/patch-1Lukas Larsson
Update erlang.xml / map_get in guard tests
2019-05-15Merge pull request #2232 from seeekr/patch-1Lukas Larsson
fix typo in gen_statem.xml
2019-05-15Updated OTP versionOTP-21.3.8.2Erlang/OTP
2019-05-15Prepare releaseErlang/OTP
2019-05-15Merge branch 'lars/fix-sax-parser-bug-during-check-encoding/OTP-15826' into ↵Erlang/OTP
maint-21 * lars/fix-sax-parser-bug-during-check-encoding/OTP-15826: [xmerl] Fix parse bug when checking the character encoding
2019-05-15Updated OTP versionOTP-22.0.1Erlang/OTP
2019-05-15Prepare releaseErlang/OTP
2019-05-15Merge branch 'ingela/ssl-flow-ctrl/ERL-934/OTP-15825' into maint-22Erlang/OTP
* ingela/ssl-flow-ctrl/ERL-934/OTP-15825: ssl: Refactor of OTP 22 code due to patch OTP-15823 ssl: Avoid dialyzer warning ssl: Add test cases for issue reported in ERL-938 ssl: Internal active n must back off when user does not read data ssl: Remove legacy calls to next_record
2019-05-15[xmerl] Fix parse bug when checking the character encodingLars Thorsen
The parser chrashed when an endmarker was missing when parsing attribute values during the character encoding check.
2019-05-15Merge branch 'maint'Ingela Anderton Andin
2019-05-15Merge branch 'ingela/ssl-flow-ctrl/ERL-934/OTP-15825' into maintIngela Anderton Andin
* ingela/ssl-flow-ctrl/ERL-934/OTP-15825: ssl: Refactor of OTP 22 code due to patch OTP-15823 ssl: Avoid dialyzer warning ssl: Add test cases for issue reported in ERL-938 ssl: Internal active n must back off when user does not read data ssl: Remove legacy calls to next_record Conflicts: lib/ssl/src/tls_connection.erl
2019-05-15ssl: Refactor of OTP 22 code due to patch OTP-15823Ingela Anderton Andin
2019-05-15ssl: Avoid dialyzer warningIngela Anderton Andin
Maybe we should only have specs for external APIs?! This is a how to write spec problem that we have to address later.
2019-05-15ssl: Add test cases for issue reported in ERL-938Ingela Anderton Andin
2019-05-15ssl: Internal active n must back off when user does not read dataIngela Anderton Andin
TLS connections should not buffer too much application data if they want to benefit from TCP flow control. Certain applications may want to customize the value of internal_active_n as there is a tradeoff between buffering memory and throughput. Conflicts: lib/ssl/src/tls_connection.erl
2019-05-15ssl: Remove legacy calls to next_recordIngela Anderton Andin
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl
2019-05-15Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Prepare release
2019-05-15Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-05-14Merge branch 'maint'Rickard Green
* maint: Bump patch merge version
2019-05-14Bump patch merge versionRickard Green
2019-05-14Update pre-push hook after master releaseSverker Eriksson
2019-05-14Merge branch 'maint'Ingela Anderton Andin
2019-05-14Merge branch 'ingela/ssl/patch-addition' into maintIngela Anderton Andin
* ingela/ssl/patch-addition: ssl: Refactor of OTP 22 code due to patch OTP-15823
2019-05-14ssl: Refactor of OTP 22 code due to patch OTP-15823Ingela Anderton Andin
2019-05-14erts: Fix memory leaks in socket_nifSverker Eriksson
2019-05-14erts: Fix dealloction bug in socket_nifSverker Eriksson
2019-05-14Updated OTP versionOTP-21.3.8.1Erlang/OTP
2019-05-14Prepare releaseErlang/OTP
2019-05-14Merge branch 'john/tools/fix-cover-register-race/ERL-943/OTP-15813' into ↵Erlang/OTP
maint-21 * john/tools/fix-cover-register-race/ERL-943/OTP-15813: cover: Fix register/2 race on startup
2019-05-14Merge branch 'john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819' ↵Erlang/OTP
into maint-21 * john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819: erts: Fix buffer overflow in xxx_to_existing_atom
2019-05-14Merge branch 'ingela/ssl/flow-ctrl/ERL-934/ERL-938/OTP-15823' into maint-21Erlang/OTP
* ingela/ssl/flow-ctrl/ERL-934/ERL-938/OTP-15823: ssl: Avoid dialyzer warning ssl: Add test cases for issue reported in ERL-938 ssl: Internal active n must back off when user does not read data ssl: Remove legacy calls to next_record Revert "ssl: Add check when to toggle internal active N"
2019-05-14Merge branch 'maint'Ingela Anderton Andin
2019-05-14Merge pull request #2223 from josevalim/patch-10John Högberg
Use file:name_all() on spawn_executable
2019-05-14Merge branch 'ingela/ssl/flow-ctrl/ERL-934/ERL-938/OTP-15823' into maintIngela Anderton Andin
* ingela/ssl/flow-ctrl/ERL-934/ERL-938/OTP-15823: ssl: Avoid dialyzer warning ssl: Add test cases for issue reported in ERL-938 ssl: Internal active n must back off when user does not read data ssl: Remove legacy calls to next_record Revert "ssl: Add check when to toggle internal active N" Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
2019-05-14Merge branch 'maint'John Högberg
* maint: erts: Fix buffer overflow in xxx_to_existing_atom cover: Fix register/2 race on startup
2019-05-14Merge branch 'john/tools/fix-cover-register-race/ERL-943/OTP-15813' into maintJohn Högberg
* john/tools/fix-cover-register-race/ERL-943/OTP-15813: cover: Fix register/2 race on startup
2019-05-14Merge branch 'john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819' ↵John Högberg
into maint * john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819: erts: Fix buffer overflow in xxx_to_existing_atom
2019-05-14Update OTP_VERSION for rc0Henrik Nord
2019-05-13fix typo in gen_statem.xmlDenis Andrejew
2019-05-13erts: Fix buffer overflow in xxx_to_existing_atomJohn Högberg
2019-05-13cover: Fix register/2 race on startupJohn Högberg