summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-17.5.6Erlang/OTP2015-06-012-1/+2
* Update release notesErlang/OTP2015-06-013-2/+61
* Merge branch 'hans/ssh/codenomicon_degradation/OTP-12784' into maint-17Erlang/OTP2015-06-015-30/+152
|\
| * ssh: update ssh versionHans2015-05-291-1/+1
| * ssh: Plain text message returned for invalid version exchangeHans2015-05-291-7/+6
| * ssh: Implement keyboard_interactive on server sideHans2015-05-293-4/+104
| * ssh: Check e and f parameters in kexdhHans Nilsson2015-05-291-16/+34
| * ssh: Set max num algoritms in msg_kexinit negotiationHans2015-05-291-2/+7
* | Merge branch 'ia/ssl/crypto-bad-input/OTP-12783' into maint-17Erlang/OTP2015-06-013-17/+21
|\ \
| * | ssl: Prepare for releaseIngela Anderton Andin2015-05-292-1/+3
| * | ssl: Correct handling of bad input to premaster_secret calculationIngela Anderton Andin2015-05-291-16/+18
| |/
* | Merge branch 'ia/ssh/recvbuf/OTP-12782' into maint-17Erlang/OTP2015-06-011-3/+16
|\ \
| * | ssh: handle that inet:getopts(Socket, [recbuf]) may return {ok, []}Ingela Anderton Andin2015-05-291-3/+16
| |/
* | Merge branch 'ia/inets/filter-headers/OTP-12776' into maint-17Erlang/OTP2015-06-0113-129/+306
|\ \ | |/ |/|
| * inets: Prepare for releaseIngela Anderton Andin2015-05-291-2/+2
| * inets: Add customize optionIngela Anderton Andin2015-05-2912-127/+304
|/
* Updated OTP versionOTP-17.5.5Erlang/OTP2015-05-292-1/+2
* Update release notesErlang/OTP2015-05-291-0/+30
* Merge branch 'anders/diameter/test/OTP-12767' into maint-17Erlang/OTP2015-05-294-19/+19
|\
| * Replace config suite call to erlang:now/0Anders Svensson2015-05-241-1/+1
| * Fix incorrect suite usage of OTP 18 monotonic timeAnders Svensson2015-05-242-9/+9
| * Make tls suite crash more verboselyAnders Svensson2015-05-241-9/+9
* | Merge branch 'anders/diameter/17.5.5/OTP-12757' into maint-17Erlang/OTP2015-05-293-4/+10
|\ \
| * | vsn -> 1.9.2Anders Svensson2015-05-231-1/+1
| * | Update appup for 17.5.5Anders Svensson2015-05-231-2/+8
| * | Fix mangled release noteAnders Svensson2015-05-231-1/+1
| |/
* | Merge branch 'anders/diameter/sctp/OTP-12744' into maint-17Erlang/OTP2015-05-293-21/+44
|\ \
| * | Fix diameter_sctp listener raceAnders Svensson2015-05-241-1/+1
| * | Tweak transport suite failuresAnders Svensson2015-05-241-8/+9
| * | Run traffic suite over SCTPAnders Svensson2015-05-241-12/+34
| |/
* | Merge branch 'anders/diameter/counters/OTP-12741' into maint-17Erlang/OTP2015-05-293-116/+258
|\ \
| * | Fix counting of no_result_code/invalid_error_bitAnders Svensson2015-05-181-2/+2
| * | Count relayed answersAnders Svensson2015-05-181-26/+55
| * | Rename dictionary-related functions/variablesAnders Svensson2015-05-181-55/+57
| * | Lift answer send up the call chainAnders Svensson2015-05-181-5/+5
| * | Count discarded incoming messagesAnders Svensson2015-05-182-1/+3
| * | Include R-bit in unknown message counter keysAnders Svensson2015-05-182-39/+42
| * | Fix broken relay countersAnders Svensson2015-05-181-3/+7
| * | Fix broken result code countersAnders Svensson2015-05-181-1/+1
| * | Add counters testcase to relay suiteAnders Svensson2015-05-171-6/+108
| |/
* | Updated OTP versionOTP-17.5.4Erlang/OTP2015-05-182-1/+2
* | Update release notesErlang/OTP2015-05-182-1/+35
* | Merge branch 'hans/ssh/ssh_msg_debug_fun/OTP-12738' into maint-17Erlang/OTP2015-05-185-9/+119
|\ \
| * | ssh: option for handling the SSH_MSG_DEBUG message's printoutsHans Nilsson2015-05-135-9/+119
| |/
* | Merge branch 'hans/inets/bad_content_length/OTP-12739' into maint-17Erlang/OTP2015-05-182-3/+7
|\ \ | |/ |/|
| * inets: reject negative content-lengthHans Nilsson2015-05-122-3/+7
|/
* Updated OTP versionOTP-17.5.3Erlang/OTP2015-05-062-1/+2
* Prepare releaseErlang/OTP2015-05-066-2/+174
* Merge branch 'anders/diameter/17.5.3/OTP-12702' into maint-17Erlang/OTP2015-05-063-69/+62
|\
| * Fix broken pre-17.4 appupAnders Svensson2015-05-032-66/+45