aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-10-18Merge branch 'hans/inets/ftp_multiline_resp/PR-1196/OTP-13960' into maintHans Nilsson
2016-10-18Merge branch 'hans/inets/ftp_locks/OTP-13967' into maintHans Nilsson
2016-10-18Merge branch 'maint-19' into maintHans Nilsson
2016-10-18Merge branch 'lukas/erts/etp-disasm' into maintLukas Larsson
* lukas/erts/etp-disasm: erts: Add etp-disasm gdb macro
2016-10-18erts: Add etp-disasm gdb macroLukas Larsson
2016-10-17Updated OTP versionOTP-19.1.5Erlang/OTP
2016-10-17Prepare releaseErlang/OTP
2016-10-17Merge branch 'hans/ssh/rekey_problem/OTP-13972' into maint-19Erlang/OTP
* hans/ssh/rekey_problem/OTP-13972: ssh: fix renegotiation problem ssh: test case for renegotiation with openssh client
2016-10-17ssh: fix renegotiation problemHans Nilsson
2016-10-17ssh: test case for renegotiation with openssh clientHans Nilsson
2016-10-17Merge branch 'egil/erl_docgen/reformat-docgen-encoding/OTP-13971' into maintBjörn-Egil Dahlberg
* egil/erl_docgen/reformat-docgen-encoding/OTP-13971: Reformat docgen xml encoding
2016-10-14Merge branch 'ingela/ssl/tune-timeouts-basic_SUITE' into maintIngela Anderton Andin
* ingela/ssl/tune-timeouts-basic_SUITE: ssl: Tune timeout for old solaris machine
2016-10-14ssl: Tune timeout for old solaris machineIngela Anderton Andin
2016-10-14ftp: New DBG alternative: ct:palHans Nilsson
2016-10-14ftp: added forgotten inet:setopts active onceHans Nilsson
2016-10-14ftp: socket wrapper changed suddenly and erroneouslyHans Nilsson
2016-10-14Merge branch 'maint-19' into maintHans Nilsson
2016-10-13Updated OTP versionOTP-19.1.4Erlang/OTP
2016-10-13Prepare releaseErlang/OTP
2016-10-13Merge branch 'hans/ssh/harmful_badmatch/OTP-13966' into maint-19Erlang/OTP
* hans/ssh/harmful_badmatch/OTP-13966: ssh: Removed matching of 'ok' after send which could cause error reports ssh: ssh_protocol_SUITE test for handling of illegal info_lines ssh: property test case for illegal infoline and close This tests an illegal client that sends an info line and closes 'immediatly'.
2016-10-13ssh: Removed matching of 'ok' after send which could cause error reportsHans Nilsson
2016-10-13ssh: ssh_protocol_SUITE test for handling of illegal info_linesHans Nilsson
2016-10-13ssh: property test case for illegal infoline and closeHans Nilsson
This tests an illegal client that sends an info line and closes 'immediatly'.
2016-10-13Merge branch 'hasse/dialyzer/fix_opaque_bugs/OTP-13693' into maintHans Bolinder
* hasse/dialyzer/fix_opaque_bugs/OTP-13693: dialyzer: Fix opaque bug dialyzer: Fix opaque bugs
2016-10-12Merge branch 'xsipewe/dialyzer/doc_cleanup' into maintHans Bolinder
* xsipewe/dialyzer/doc_cleanup: Update Dialyzer documentation
2016-10-11Reformat docgen xml encodingBjörn-Egil Dahlberg
epp:default_encoding/0 returns 'utf8' and needs to be re-encoded to "UTF-8" to be correct.
2016-10-11Merge remote-tracking branch 'github/pr/1199' into maintIngela Anderton Andin
* github/pr/1199: Correct a typo in mod_esi documentation
2016-10-11Merge branch 'ingela/ssl/algo-check/OTP-13959' into maintIngela Anderton Andin
* ingela/ssl/algo-check/OTP-13959: Properly filter ssl cipher suites reported as supported
2016-10-11Merge branch 'ingela/ssl/crl_SUITE' into maintIngela Anderton Andin
* ingela/ssl/crl_SUITE: ssl: Make sure test has correct input
2016-10-11Merge branch 'maint-19' into maintHans Nilsson
2016-10-11Merge branch 'egil/erts/fix-profile_boot-flag/ERL-280/OTP-13955' into maintBjörn-Egil Dahlberg
* egil/erts/fix-profile_boot-flag/ERL-280/OTP-13955: Update preloaded init.beam erts: Fix -profile_boot 'true'|'false' parsing
2016-10-11Update Dialyzer documentationxsipewe
Language cleaned up by the technical writer xsipewe from Combitech. Proofreading and corrections by Hans Bolinder.
2016-10-10Correct a typo in mod_esi documentationWill
2016-10-10Update preloaded init.beamBjörn-Egil Dahlberg
2016-10-10erts: Fix -profile_boot 'true'|'false' parsingBjörn-Egil Dahlberg
Strictly speaking 'true' and 'false' arguments is not necessary, but it should work if supplied.
2016-10-10Updated OTP versionOTP-19.1.3Erlang/OTP
2016-10-10Prepare releaseErlang/OTP
2016-10-10Merge branch 'hans/ssh/revert_nonblocking_sender_seq13199/OTP-13953' into ↵Erlang/OTP
maint-19 * hans/ssh/revert_nonblocking_sender_seq13199/OTP-13953: Revert "ssh: Add non-blocking send" since it introduces Error Reports
2016-10-10Revert "ssh: Add non-blocking send" since it introduces Error ReportsHans Nilsson
This reverts commit 28baf1314b556bb592c24181f6967e1f324f44a7.
2016-10-10Merge branch 'sverker/load_nif-print-init-error/OTP-13951' into maintSverker Eriksson
* sverker/load_nif-print-init-error: crypto: Return source line number from failed load/upgrade erts: Print error code from failed NIF load/upgrade/reload
2016-10-10Properly filter ssl cipher suites reported as supportedDániel Szoboszlay
Adapted from commit 675ee6860d2c273bcc6c6a0536634a107e2a3d9f. Conflicts: lib/ssl/src/ssl_cipher.erl
2016-10-07Merge branch 'bjorn/compiler/beam_bsm/ERL-268/OTP-13947' into maintBjörn Gustavsson
* bjorn/compiler/beam_bsm/ERL-268/OTP-13947: beam_bsm: Eliminate unsafe optimization
2016-10-07Merge branch 'ingela/inets/httpc/ERL-253' into maintIngela Anderton Andin
* ingela/inets/httpc/ERL-253: inets: httpc improve error handling
2016-10-07Merge branch 'kostis/inets-reference-record-types/PR-1188' into maintIngela Anderton Andin
* kostis/inets-reference-record-types/PR-1188: Replace ref() with reference() in inets files
2016-10-07Merge branch 'ingela/ssl/cipher-type-spec' into maintIngela Anderton Andin
* ingela/ssl/cipher-type-spec: ssl: Adjust cipher type to conform to implementation
2016-10-07Merge branch 'dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934' into maintDan Gudmundsson
* dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934: Fix guard test for chardata
2016-10-07Merge branch 'dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944' into maintDan Gudmundsson
* dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944: Allow reusing mnesia select continuations
2016-10-07Merge branch 'dgud/tools/emacs/edoc-support/PR-1195/OTP-13945' into maintDan Gudmundsson
* dgud/tools/emacs/edoc-support/PR-1195/OTP-13945: New file erlang-edoc.el to support EDoc in erlang-mode
2016-10-07Merge branch 'rohrer/doc/undefined_fields/PR-1189' into maintHans Bolinder
* rohrer/doc/undefined_fields/PR-1189: Update per review comments. Fix reference to automatic `undefined` field declared types.
2016-10-06Fix inets ftp bug related to multiple lines respJohan Sommerfeld
Fixes a bug that makes the ftp client end up in bad state if there is a multi line response from the server and the response number is in the message being sent.