summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* kernel: Fix spelling error in assert.hrllukas/kernel/docs-assertLukas Larsson2018-10-171-1/+1
|
* Merge branch 'igor/tcp-nopush-ERL-698/OTP-15357' into maintJohn Högberg2018-10-176-3/+76
|\ | | | | | | | | | | * igor/tcp-nopush-ERL-698/OTP-15357: "cork" tcp socket around file:sendfile Add nopush TCP socket option
| * "cork" tcp socket around file:sendfileIgor Slepchin2018-10-111-1/+23
| | | | | | | | | | This fixes 200ms delay on the last TCP segment when using file:sendfile/2 on Linux (ERL-698).
| * Add nopush TCP socket optionIgor Slepchin2018-10-115-2/+53
| | | | | | | | | | | | | | | | | | | | | | This translates to TCP_CORK on Linux and TCP_NOPUSH on BSD. In effect, this acts as super-Nagle: no partial TCP segments are sent out until this option is turned off. Once turned off, all accumulated unsent data is sent out immediately. The latter is *not* the case on OSX, hence the implementation ignores "nopush" on OSX to reduce confusion.
* | Merge branch 'sverker/erts/18/memory-leak-terminating-port/OTP-14609' into maintSverker Eriksson2018-10-160-0/+0
|\ \ | | | | | | | | | | | | * sverker/erts/18/memory-leak-terminating-port/OTP-14609: erts: Fix memory leak when sending to terminating port
| * | erts: Fix memory leak when sending to terminating portSverker Eriksson2018-09-191-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from 7c5fcd3f2701cbb614930682ac52ff75b9c26e6c Error: Leak_DefinitelyLost erts_alloc:230 (-> 0x52E54D) [erl_alloc.h] port_task_alloc:154 (-> 0x52F3CA) [erl_port_task.c] erts_port_task_alloc_p2p_sig_data:212 (-> 0x52F5D3) [erl_port_task.c] erts_port_output:2147 (-> 0x4F6057) [io.c] erts_port_command:4126 (-> 0x4FA10E) [io.c] do_send:2200 (-> 0x4E4C64) [bif.c] erl_send:2494 (-> 0x4E5E09) [bif.c] process_main:1730 (-> 0x43ADA5) [beam_emu.c]
* | | Merge branch 'john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753' ↵John Högberg2018-10-162-2/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into maint * john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753: beam_utils: Handle bs_start_match2 in anno_defs
| * | | beam_utils: Handle bs_start_match2 in anno_defsJohn Högberg2018-10-152-2/+21
| | | |
* | | | Merge branch 'maint-21' into maintRickard Green2018-10-1218-78/+249
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-21: Updated OTP version Prepare release erts: Fix UNC path handling on Windows erts: Fix a compiler warning eldap: Fix race at socket close Fix bug for sockopt pktoptions on BSD erts: Fix memory leak on file read errors
| * | | Updated OTP versionOTP-21.1.1Erlang/OTP2018-10-122-1/+2
| | | |
| * | | Prepare releaseErlang/OTP2018-10-129-4/+101
| | | |
| * | | Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into ↵Erlang/OTP2018-10-123-2/+90
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-21 * ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348: ssl: TLS sender process needs to get updates of the socket option packet
| * \ \ \ Merge branch 'ingela/maint/ssl/close-alert-ERL-738/OTP-15337' into maint-21Erlang/OTP2018-10-127-115/+152
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ingela/maint/ssl/close-alert-ERL-738/OTP-15337: ssl: ERL-738 - Correct alert handling with new TLS sender process
| * \ \ \ \ Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into ↵Erlang/OTP2018-10-121-3/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-21 * hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242: eldap: Fix race at socket close
| | * | | | | eldap: Fix race at socket closeHans Nilsson2018-10-051-3/+12
| | | | | | |
| * | | | | | Merge branch 'john/erts/fix-unc-paths-windows/OTP-15333/ERL-737' into maint-21Erlang/OTP2018-10-123-58/+133
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * john/erts/fix-unc-paths-windows/OTP-15333/ERL-737: erts: Fix UNC path handling on Windows erts: Fix a compiler warning
| | * | | | | | erts: Fix UNC path handling on WindowsJohn Högberg2018-10-113-57/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unlikely to be the last of the path problems seen after OTP 21, and I'm starting to regret my decision to unconditionally use long paths. The idea to hit all long-path problems all the time was good in theory as it makes such bugs far more visible, but there just aren't enough people who test pre-release versions on Windows, making this the world's slowest game of whack-a-mole.
| | * | | | | | erts: Fix a compiler warningJohn Högberg2018-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would've been a bug if the value was used.
| * | | | | | | Merge branch 'bjorn/compiler/fix-binary-matching/ERL-689/OTP-15335' into ↵Erlang/OTP2018-10-123-15/+98
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-21 * bjorn/compiler/fix-binary-matching/ERL-689/OTP-15335: Fix rare bug in binary matching (again)
| * \ \ \ \ \ \ \ Merge branch 'raimo/BSD-sockopt-pktoptions/ERIERL-187/OTP-14297' into maint-21Erlang/OTP2018-10-122-6/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * raimo/BSD-sockopt-pktoptions/ERIERL-187/OTP-14297: Fix bug for sockopt pktoptions on BSD
| | * | | | | | | | Fix bug for sockopt pktoptions on BSDRaimo Niskanen2018-10-012-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macros for the BSD style option names had accidentally wound up outside the option parsing loop, causing unclear behaviour and Valgrind errors.
| * | | | | | | | | Merge branch 'john/erts/fix-prim_file-error-leak/OTP-15318' into maint-21Erlang/OTP2018-10-121-0/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * john/erts/fix-prim_file-error-leak/OTP-15318: erts: Fix memory leak on file read errors
| | * | | | | | | | erts: Fix memory leak on file read errorsJohn Högberg2018-09-261-0/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1974 from ↵Raimo Niskanen2018-10-126-192/+447
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RaimoNiskanen/raimo/getifaddrs-netns/ERIERL-189/OTP-15121 Implement {netns,NS} option for inet:getifaddrs/1 and friends
| * | | | | | | | | Adjust test case to realityRaimo Niskanen2018-10-051-83/+89
| | | | | | | | | |
| * | | | | | | | | Implement {netns,NS} option for inet:getifaddrs/1Raimo Niskanen2018-10-025-109/+358
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also implement the same option for the legacy undocumented functions inet:getif/1,getiflist/1,ifget/2,ifset/2. The arity 1 functions had before this change got signatures that took a socket port that was used to do the needed syscall, so now the signature was extended to also take an option list with the only supported option {netns,Namespace}. The Socket argument variant remains unsupported. For inet:getifaddrs/1 the documentation file was changed to old style function name definition so be able to hide the Socket argument variant that is visible in the type spec. The arity 2 functions had got an option list as second argument. This list had to be partitioned into one list for the namespace option(s) and the other for the rest. The namespace option list was then fed to the already existing namespace support for socket opening, which places the socket in a namespace and hence made all these functions that in inet_drv.c used getsockopt() work without change. The functions that used getifaddrs() in inet_drv.c had to be changed in inet_drv.c to swap namespaces around the getifaddrs() syscall. This functionality was separated into a new function call_getifaddrs().
* | | | | | | | | Merge branch 'maint-17' into maintRickard Green2018-10-113-0/+104
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-17: Updated OTP version Prepare release
| * | | | | | | | | Updated OTP versionOTP-17.5.6.10maint-17Erlang/OTP2018-10-112-1/+2
| | | | | | | | | |
| * | | | | | | | | Prepare releaseErlang/OTP2018-10-113-1/+85
| | | | | | | | | |
| * | | | | | | | | Merge branch 'sverker/r16/binary_to_atom-utf8-crash/ERL-474/OTP-14590' into ↵Erlang/OTP2018-10-113-1/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-17 * sverker/r16/binary_to_atom-utf8-crash/ERL-474/OTP-14590: erts: Fix crash in binary_to_atom/term for invalid utf8
| * \ \ \ \ \ \ \ \ \ Merge branch 'sverker/big-bxor-bug/ERL-450/OTP-14514' into maint-17Erlang/OTP2018-10-113-3/+96
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sverker/big-bxor-bug/ERL-450/OTP-14514: erts: Fix bug in bxor of a big negative number
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/bin2term-zlib-bug/ERL-340/OTP-14159' into maint-17Erlang/OTP2018-10-111-7/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sverker/bin2term-zlib-bug/ERL-340/OTP-14159: erts: Fix binary_to_term for compressed and zlib >= v1.2.9
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maint-17Erlang/OTP2018-10-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/thr-prgr-unmanaged-delay-bug/OTP-13869: Fix erts_thr_progress_unmanaged_delay()
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/drv-send-term-thr-bug/OTP-13866' into maint-17Erlang/OTP2018-10-111-10/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/drv-send-term-thr-bug/OTP-13866: Fix thread calls to erl_drv_send_term()/erl_drv_output_term()
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/port-sig-dropped-fix/OTP-13424' into maint-17Erlang/OTP2018-10-111-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/port-sig-dropped-fix/OTP-13424: Fix implementation of dropped signal to port
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hans/crypto/fix_RSA_opts/OTP-15302' into maintHans Nilsson2018-10-113-111/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hans/crypto/fix_RSA_opts/OTP-15302: crypto: Update RSA tests after algorithms doc chapter crypto: Update RSA options to match specs and different OpenSSL versions - Put rsa_pkcs1_oaep_padding in supports/0 - #ifdef updates - Refine PKCS1_OAEP defines
| * | | | | | | | | | | | | | | | crypto: Update RSA tests after algorithms doc chapterHans Nilsson2018-10-111-78/+93
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | crypto: Update RSA options to match specs and different OpenSSL versionsHans Nilsson2018-10-112-33/+88
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Put rsa_pkcs1_oaep_padding in supports/0 - #ifdef updates - Refine PKCS1_OAEP defines
* | | | | | | | | | | | | | | | Merge branch 'pr/1949' into maintDan Gudmundsson2018-10-119-128/+212
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pr/1949: Run emacs tests from test_suite Emacs: consider case in erlang-get-identifier-at-point Emacs: do not accept compiler warnings in selected elisp files Emacs: add test-erlang-mode
| * | | | | | | | | | | | | | | | Run emacs tests from test_suiteDan Gudmundsson2018-10-093-157/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drive emacs test from test_suite instead of bash script.
| * | | | | | | | | | | | | | | | Emacs: consider case in erlang-get-identifier-at-pointJohan Claesson2018-10-092-13/+15
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Emacs: do not accept compiler warnings in selected elisp filesJohan Claesson2018-10-099-79/+112
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Emacs: add test-erlang-modeJohan Claesson2018-10-092-23/+122
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ingela/ssl/merge-fix' into maintIngela Anderton Andin2018-10-111-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ingela/ssl/merge-fix: ssl: Fix up incorrect automatic merge
| * | | | | | | | | | | | | | | | | ssl: Fix up incorrect automatic mergeIngela Anderton Andin2018-10-111-7/+0
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into ↵Ingela Anderton Andin2018-10-111-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint Conflicts: lib/ssl/src/tls_sender.erl
| * | | | | | | | | | | | | | | | ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin2018-10-113-2/+90
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the socket option is set to {packet, 1|2|3|4} sender process needs to add a packet length header. If packet is changed with ssl:setopts/2 this needs to be communicated to tls_sender.
* | | | | | | | | | | | | | | | Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into ↵Ingela Anderton Andin2018-10-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint
| * | | | | | | | | | | | | | | | ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin2018-10-103-2/+91
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the socket option is set to {packet, 1|2|3|4} sender process needs to add a packet length header. If packet is changed with ssl:setopts/2 this needs to be communicated to tls_sender.
* | | | | | | | | | | | | | | | Merge branch 'ingela/maint/ssl/close-alert-ERL-738/OTP-15337' into maintIngela Anderton Andin2018-10-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |