summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint-r16b02' into maint-r16maint-r16Raimo Niskanen2017-02-094-4/+70
|\ | | | | | | | | | | | | Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
| * Merge branch 'bmk/snmp/compiler/allow_refinement_of_opaque/OTP-12066' into ↵maint-r16b02Micael Karlberg2014-07-234-4/+78
| |\ | | | | | | | | | | | | | | | maint-r16b02 OTP-12066
| | * [snmp/compiler] Assign "proper" (= carbonara) versionMicael Karlberg2014-07-212-3/+3
| | |
| | * [snmp/compiler] Refinement of type Opaque was not allowedMicael Karlberg2014-07-214-4/+78
| | | | | | | | | | | | | | | | | | 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.
* | | Prepare releaseerl_1271Erlang/OTP2016-02-262-1/+20
| | |
* | | Merge branch 'sverk/r16/crypto-EVP-aes_cbc/OTP-13384' into maint-r16Erlang/OTP2016-02-261-15/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | * sverk/r16/crypto-EVP-aes_cbc/OTP-13384: crypto: Fix undefined symbol EVP_CIPHER_CTX_new crypto: use EVP for AES-CBC
| * | | crypto: Fix undefined symbol EVP_CIPHER_CTX_newSverker Eriksson2016-02-261-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | crypto: use EVP for AES-CBCAlex Wilson2016-02-261-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the use of hardware acceleration for AES crypto on newer Intel CPUs (AES-NI), among other platforms. Cherry-pick from 425a34001fdd
* | | | Update release notesErlang/OTP2015-12-091-0/+30
| | | |
* | | | Merge branch 'anders/diameter/patch/OTP-13183' into maint-r16Erlang/OTP2015-12-092-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * anders/diameter/patch/OTP-13183: vsn -> 1.5.1 Update appup for diameter 1.5.1
| * | | | vsn -> 1.5.1Anders Svensson2015-12-091-1/+1
| | | | |
| * | | | Update appup for diameter 1.5.1Anders Svensson2015-12-091-2/+11
| |/ / /
* | | | Merge branch 'anders/diameter/logging/OTP-13182' into maint-r16Erlang/OTP2015-12-091-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * anders/diameter/logging/OTP-13182: Remove logging of faulty answer messages
| * | | | Remove logging of faulty answer messagesAnders Svensson2015-12-091-2/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'anders/diameter/pick_peer/OTP-11789' into maint-r16Erlang/OTP2015-12-091-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * anders/diameter/pick_peer/OTP-11789: Fix pick_peer case clause failure
| * | | | Fix pick_peer case clause failureAnders Svensson2014-03-201-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Prepare releaseErlang/OTP2015-01-262-1/+20
| | | |
* | | | Merge branch 'sverk/port_get_data-race-r16b03/OTP-12208' into maint-r16Erlang/OTP2015-01-263-7/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | erts: Fix port data memory allocation bugSverker Eriksson2015-01-212-11/+17
| | | | | | | | | | | | | | | | | | | | for non-immediate port data >= sizeof(Eterm)*2 words.
| * | | | erts: Mend port_set_data with non-immed data for halfword VMSverker Eriksson2015-01-211-1/+2
| | | | |
| * | | | erts: Add test case for port_set_data and port_get_dataSverker Eriksson2015-01-211-0/+51
| | | | |
| * | | | erts: Fix race between port_set_data, port_get_data and port terminationSverker Eriksson2015-01-211-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | erts: Fix erlang:port_set_data/2 for non immediate dataSverker Eriksson2015-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | hsize field was not set leading to VM crash
* | | | | Merge branch 'marcus/16/fix-rebuild' into maint-r16Erlang/OTP2015-01-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * marcus/16/fix-rebuild: Sort keys before generating
| * | | | | Sort keys before generatingLukas Larsson2014-11-281-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | This has to be done in order to consistently generate the same file so that we do not get rebuilds all the time.
* | | | | Prepare releaseErlang/OTP2014-10-212-1/+29
| | | | |
* | | | | Merge branch 'rickard/eager-check-io/OTP-12117' into maint-r16Erlang/OTP2014-10-2124-178/+850
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * rickard/eager-check-io/OTP-12117: Introduce support for eager check I/O scheduling
| * | | | | Introduce support for eager check I/O schedulingRickard Green2014-09-2524-178/+850
|/ / / / /
* | | | | Update release notesErlang/OTP2014-07-222-0/+42
| | | | |
* | | | | Merge branch 'lukas/kernel/bind_with_fdopen/OTP-12061' into maint-r16Erlang/OTP2014-07-2211-23/+179
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | Fix default behaviour for legacy fdopenHenrik Nord2014-07-222-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Update testcase for gen_udp:open/2 with option fd
| * | | | | erts: Fix inet close on prebound fdsBjörn-Egil Dahlberg2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Inet close must remove fd from select/poll without closing the fd.
| * | | | | kernel: When doing an fdopen we now also bind the fd to the specified addr/portLukas Larsson2014-07-2210-20/+175
|/ / / / /
* | | | | Merge branch 'hans/ssh/maint-r16/patch_1261' into maint-r16Hans Nilsson2014-02-243-30/+43
|\ \ \ \ \
| * | | | | fix calculation of variableHenrik Nord2014-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | thanks to Alexander Demidenko
| * | | | | ssh: The server ssh_cli does not delay tty_geometry requests in case no tty ↵Hans Nilsson2014-02-141-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | is allocated
| * | | | | ssh: fix 'known_hosts' bug in ssh_fileHans Nilsson2014-02-141-13/+13
| | | | | |
| * | | | | ssh: Changed order of decode clauses to temp fix decode errorHans Nilsson2014-02-141-9/+12
| | | | | |
| * | | | | ssh: Fixes memory crashHans Nilsson2014-02-141-2/+3
| | | | | |
| * | | | | Fix that result on stderr sent back to ssh:exec had length info presentHans Nilsson2014-02-141-2/+2
|/ / / / /
* | | | | Merge branch 'maint-r16' into maintIngela Anderton Andin2014-02-100-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'maint-r15' into maint-r16Ingela Anderton Andin2014-02-100-0/+0
| |\ \ \ \ |/ / / / /
| * | | | Prepare releaseErlang/OTP2014-02-052-2/+18
| | | | |
| * | | | Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15Erlang/OTP2014-02-05222-11236/+13739
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. ...
| | * | | | Changed to correct errorcode in testcaseFredrik Gustafsson2014-02-051-1/+1
| | | | | |
| | * | | | inets: Prepare for releaseIngela Anderton Andin2014-02-051-2/+2
| | | | | |
| | * | | | inets: Make test suites independent of each otherIngela Anderton Andin2014-02-051-2/+3
| | | | | |
| | * | | | inets: Rewrite of test case to avoid timing issues in test codeIngela Anderton Andin2014-02-051-73/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/inets/test/httpd_SUITE.erl
| | * | | | Add missing brackets to report formatting on ftp_progress process exitArtur Wilniewczyc2014-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When progress reporting process exits, ftp client crashes because of missing brackets in io_lib:format argument.
| | * | | | inets: Remove log message as it causes more harm than use at the momentIngela Anderton Andin2014-02-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/inets/src/http_lib/http_request.erl
View Lorry Controller Status