aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-02-09Merge branch 'maint-r16b02' into maint-r16maint-r16Raimo Niskanen
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2016-02-26Prepare releaseerl_1271Erlang/OTP
2016-02-26Merge branch 'sverk/r16/crypto-EVP-aes_cbc/OTP-13384' into maint-r16Erlang/OTP
* sverk/r16/crypto-EVP-aes_cbc/OTP-13384: crypto: Fix undefined symbol EVP_CIPHER_CTX_new crypto: use EVP for AES-CBC
2016-02-26crypto: Fix undefined symbol EVP_CIPHER_CTX_newSverker Eriksson
Use a stack allocated context and EVP_CIPHER_CTX_init/cleanup instead of dynamic EVP_CIPHER_CTX_new/free that does not exist in older 0.9.8 versions. Cherry-pick from b23f1ff1f79
2016-02-26crypto: use EVP for AES-CBCAlex Wilson
This enables the use of hardware acceleration for AES crypto on newer Intel CPUs (AES-NI), among other platforms. Cherry-pick from 425a34001fdd
2015-12-09Update release notesErlang/OTP
2015-12-09Merge branch 'anders/diameter/patch/OTP-13183' into maint-r16Erlang/OTP
* anders/diameter/patch/OTP-13183: vsn -> 1.5.1 Update appup for diameter 1.5.1
2015-12-09Merge branch 'anders/diameter/logging/OTP-13182' into maint-r16Erlang/OTP
* anders/diameter/logging/OTP-13182: Remove logging of faulty answer messages
2015-12-09Merge branch 'anders/diameter/pick_peer/OTP-11789' into maint-r16Erlang/OTP
* anders/diameter/pick_peer/OTP-11789: Fix pick_peer case clause failure
2015-12-09Remove logging of faulty answer messagesAnders Svensson
Since excessive numbers of them can overload a node with logging. Note that most log messages have been removed in OTP 17.1, and replaced by counters. In particular, logging as a result of incoming traffic, over which we have no control, is dangerous.
2015-12-09vsn -> 1.5.1Anders Svensson
2015-12-09Update appup for diameter 1.5.1Anders Svensson
2015-01-26Prepare releaseErlang/OTP
2015-01-26Merge branch 'sverk/port_get_data-race-r16b03/OTP-12208' into maint-r16Erlang/OTP
* sverk/port_get_data-race-r16b03/OTP-12208: erts: Fix port data memory allocation bug erts: Mend port_set_data with non-immed data for halfword VM erts: Add test case for port_set_data and port_get_data erts: Fix race between port_set_data, port_get_data and port termination erts: Fix erlang:port_set_data/2 for non immediate data
2015-01-26Merge branch 'marcus/16/fix-rebuild' into maint-r16Erlang/OTP
* marcus/16/fix-rebuild: Sort keys before generating
2015-01-21erts: Fix port data memory allocation bugSverker Eriksson
for non-immediate port data >= sizeof(Eterm)*2 words.
2015-01-21erts: Mend port_set_data with non-immed data for halfword VMSverker Eriksson
2015-01-21erts: Add test case for port_set_data and port_get_dataSverker Eriksson
2015-01-21erts: Fix race between port_set_data, port_get_data and port terminationSverker Eriksson
Always update prt->data with atomic xchg-op. Check for NULL data to detect racing port terminator. Use NULL, as THE_NON_VALUE can be a valid pointer on debug VM.
2015-01-21erts: Fix erlang:port_set_data/2 for non immediate dataSverker Eriksson
hsize field was not set leading to VM crash
2014-11-28Sort keys before generatingLukas Larsson
This has to be done in order to consistently generate the same file so that we do not get rebuilds all the time.
2014-10-21Prepare releaseErlang/OTP
2014-10-21Merge branch 'rickard/eager-check-io/OTP-12117' into maint-r16Erlang/OTP
* rickard/eager-check-io/OTP-12117: Introduce support for eager check I/O scheduling
2014-09-25Introduce support for eager check I/O schedulingRickard Green
2014-07-23Merge branch 'bmk/snmp/compiler/allow_refinement_of_opaque/OTP-12066' into ↵maint-r16b02Micael Karlberg
maint-r16b02 OTP-12066
2014-07-22Update release notesErlang/OTP
2014-07-22Merge branch 'lukas/kernel/bind_with_fdopen/OTP-12061' into maint-r16Erlang/OTP
* lukas/kernel/bind_with_fdopen/OTP-12061: Fix default behaviour for legacy fdopen erts: Fix inet close on prebound fds kernel: When doing an fdopen we now also bind the fd to the specified addr/port
2014-07-22Fix default behaviour for legacy fdopenHenrik Nord
Update testcase for gen_udp:open/2 with option fd
2014-07-22erts: Fix inet close on prebound fdsBjörn-Egil Dahlberg
Inet close must remove fd from select/poll without closing the fd.
2014-07-22kernel: When doing an fdopen we now also bind the fd to the specified addr/portLukas Larsson
2014-07-21[snmp/compiler] Assign "proper" (= carbonara) versionMicael Karlberg
2014-07-21[snmp/compiler] Refinement of type Opaque was not allowedMicael Karlberg
MIB constructs such as "SYNTAX Opaque (SIZE(0..65535))" was previously not allowed, this has now been fixed. See the standard ALARM-MIB for eaxmple.
2014-03-20Fix pick_peer case clause failureAnders Svensson
In the case of {call_mutates_state, true} configuration on the service in question, any peer selection that failed to select a peer resulted in a case clause failure in diameter_service:pick_peer/5, when the call to the service process returned false. This was noticed in the case of a peer failover in which an alternate peer wasn't available. The explicit matching is intentional, to match exactly what's expected.
2014-02-24Merge branch 'hans/ssh/maint-r16/patch_1261' into maint-r16Hans Nilsson
2014-02-14fix calculation of variableHenrik Nord
thanks to Alexander Demidenko
2014-02-14ssh: The server ssh_cli does not delay tty_geometry requests in case no tty ↵Hans Nilsson
is allocated
2014-02-14ssh: fix 'known_hosts' bug in ssh_fileHans Nilsson
2014-02-14ssh: Changed order of decode clauses to temp fix decode errorHans Nilsson
2014-02-14ssh: Fixes memory crashHans Nilsson
2014-02-14Fix that result on stderr sent back to ssh:exec had length info presentHans Nilsson
2014-02-10Merge branch 'maint-r16' into maintIngela Anderton Andin
2014-02-10Merge branch 'maint-r15' into maint-r16Ingela Anderton Andin
2014-02-05Prepare releaseErlang/OTP
2014-02-05Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15Erlang/OTP
* refs/heads/fetch-and-merge.maint-r15-opu/FETCH_HEAD/11632: (73 commits) Changed to correct errorcode in testcase inets: Prepare for release inets: Make test suites independent of each other inets: Rewrite of test case to avoid timing issues in test code Add missing brackets to report formatting on ftp_progress process exit inets: Remove log message as it causes more harm than use at the moment inets: Mend broken max_clients check inets: Start CT'ify httpd_SUITE inets: Remove use of default gen_server timeout Fix http_request:http_headers/1 to send content-length when length is zero Fix httpd config option 'keep_alive_timeout' Fix httpd config option 'script_timeout' inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail inets: Add crypto start check to ssl test cases ftp: fix sockname dialyzer warning including ftp:sockname/1 bug ftp,ssl: Fixes broken type link (ssloption). ftp: Adds dynamic cert generation to tests. ftp: Clean Makefile and conf file ftp: Linking rfc-refs. ftp: Add documentation. ...
2014-02-05Changed to correct errorcode in testcaseFredrik Gustafsson
2014-02-05inets: Prepare for releaseIngela Anderton Andin
2014-02-05inets: Make test suites independent of each otherIngela Anderton Andin
2014-02-05inets: Rewrite of test case to avoid timing issues in test codeIngela Anderton Andin
Conflicts: lib/inets/test/httpd_SUITE.erl
2014-02-05Add missing brackets to report formatting on ftp_progress process exitArtur Wilniewczyc
When progress reporting process exits, ftp client crashes because of missing brackets in io_lib:format argument.
2014-02-05inets: Remove log message as it causes more harm than use at the momentIngela Anderton Andin
Conflicts: lib/inets/src/http_lib/http_request.erl