aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-01-24Prepare releaseOTP_R16B03-1Erlang/OTP
2014-01-24Merge branch 'ia/ssl/secure-renegotiate/OTP-11595' into maintIngela Anderton Andin
* ia/ssl/secure-renegotiate/OTP-11595: ssl: Incorrect inputed cipherlist lead server to think that the client did not support secure renegotiation
2014-01-22ssl: Incorrect inputed cipherlist lead server to think that the clientIngela Anderton Andin
did not support secure renegotiation
2014-01-21Skip sys_erl_flagsMagnus Lidén
2014-01-21Merge branch 'nox/fix-OTP-11506' into maintMagnus Lidén
* nox/fix-OTP-11506: Smoke test erl_syntax:revert/1 Fix reverting of local implicit funs in erl_syntax
2014-01-21Smoke test erl_syntax:revert/1Anthony Ramine
This tries to make bugs like 87156887b7d82a2db53f60441a4af87034cb8789 not happen again. The new test takes each file in the stdlib app, passes their forms through the erl_syntax representation, reverts them and compiles them.
2014-01-21Fix reverting of local implicit funs in erl_syntaxAnthony Ramine
This partially reverts 290dc2b08a2f92157ac5358fba815f4dbb32f8f2 in which implicit funs were mistakenly thought to be using abstract terms for their name and arity.
2014-01-21Merge branch 'lars/xmerl/new-doc-in-same-buffer-bug/OTP-11551' into maintMagnus Lidén
* lars/xmerl/new-doc-in-same-buffer-bug/OTP-11551: [xmerl] Fix problem with header of next XML document is in the buffer when using xmerl_sax_parser:stream/2 function. [xmerl] Fix bug in SAX parser when next doc start in the same buffer
2014-01-21[xmerl] Fix problem with header of next XML document is in the bufferLars Thorsen
when using xmerl_sax_parser:stream/2 function.
2014-01-21[xmerl] Fix bug in SAX parser when next doc start in the same bufferLars Thorsen
2014-01-21Merge branch 'dgud/wx/more-fixes/OTP-11444' into maintDan Gudmundsson
* dgud/wx/more-fixes/OTP-11444: wx: Fix hanging wx calls Update wx build instsructions for Darwin wx: Remove compiler option -fomit-frame-pointer on Darwin wx: Fix crash when garbage collect event handlers (debugger caused seg fault) wx: Fix LDFLAGS for Mac
2014-01-21Merge branch 'ia/inets/httpd-manager-improvments/OTP-11557' into maintIngela Anderton Andin
* ia/inets/httpd-manager-improvments/OTP-11557: inets: Prepare for release 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
2014-01-21Merge branch 'ia/odbc/configure/OTP-11574' into maintIngela Anderton Andin
* ia/odbc/configure/OTP-11574: odbc: Fix configure check to work proparly on windows
2014-01-21Merge branch 'ia/ssl/ECC-curve-selection/OTP-11575' into maintIngela Anderton Andin
* ia/ssl/ECC-curve-selection/OTP-11575: ssl: Prepare for release ssl: fix elliptic curve selection in server mode
2014-01-21Merge branch ↵Ingela Anderton Andin
'ia/ssl/server-name-indication-missing-option-validation/OTP-11567' into maint * ia/ssl/server-name-indication-missing-option-validation/OTP-11567: ssl: Prepare for release ssl: Add missing options validation of server_name_indication
2014-01-16wx: Fix hanging wx callsDan Gudmundsson
wxWakeUpIdle doesn't always work on wxGTK and the workaround is to periodically invoke it, so the gui-thread doesn't get stuck in poll. Previously it was only called when NOT in batch mode, however if the wxWakeUpIdle call after a batch_begin command did not wake up the thread it would still get stuck in poll.
2014-01-15Update wx build instsructions for DarwinDan Gudmundsson
2014-01-15wx: Remove compiler option -fomit-frame-pointer on DarwinDan Gudmundsson
Causes a segfault when building on 10.9 with -mmacosx-version-min=10.9
2014-01-15odbc: Fix configure check to work proparly on windowsIngela Anderton Andin
2014-01-15ssl: Prepare for releaseIngela Anderton Andin
2014-01-14ssl: fix elliptic curve selection in server modeAndreas Schultz
The server code erroneously took the list of curves supported by the client from it's own hello extension, effectively breaking curve selection all together. Also the default fallback secp256k1 curve is not supported by all clients. secp256r1 is recommended as part of the NIST Suite B cryptographic suites. The chances are much better that all clients support it, so use that as fallback.
2014-01-14ssl: Prepare for releaseIngela Anderton Andin
2014-01-14ssl: Add missing options validation of server_name_indicationIngela Anderton Andin
2014-01-14Update system versionBjörn-Egil Dahlberg
2014-01-14wx: Fix crash when garbage collect event handlers (debugger caused seg fault)Dan Gudmundsson
wxStyledTextCtrl had no wrapper class so, because it was not detected that it had virtual destructors, thus references to it was not cleaned up on destruction. When a process dies and wx cleans up the event handlers access was made to the deleted object and caused a seg fault. Added a testcase which I thought could provoke the bug but didn't.
2014-01-14wx: Fix LDFLAGS for MacDan Gudmundsson
MacOSX min version must be applied to LDFLAGS otherwise linking with static wxWidgets libraries doesn't work.
2014-01-13inets: Prepare for releaseIngela Anderton Andin
2014-01-13inets: Remove log message as it causes more harm than use at the momentIngela Anderton Andin
2014-01-10inets: Mend broken max_clients checkIngela Anderton Andin
Conflicts: lib/inets/src/http_server/httpd_manager.erl
2014-01-10inets: Start CT'ify httpd_SUITEIngela Anderton Andin
2013-12-19inets: Remove use of default gen_server timeoutIngela Anderton Andin
If you need a timeout between client and server use a server side timeout instead of the default gen_server:call/2 timeout that is quite useless. Also remove legacy code that has no further use.
2013-12-09Prepare releaseOTP_R16B03Erlang/OTP
2013-12-09Merge branch 'siri/test-bugfix-upgrade-emulator' into maintMagnus Lidén
* siri/test-bugfix-upgrade-emulator: [sasl] Test bugfix in branch 'schlagert/fix_emulator_upgrades'
2013-12-09[sasl] Test bugfix in branch 'schlagert/fix_emulator_upgrades'Siri Hansen
OTP-11529
2013-12-09Update system readme for R16B03Magnus Lidén
2013-12-09Update preloaded modulesMagnus Lidén
2013-12-06Update primary bootstrap app- and appup filesMagnus Lidén
2013-12-06Update primary bootstrapMagnus Lidén
2013-12-05Merge branch 'schlagert/fix_emulator_upgrades' into maintRaimo Niskanen
* schlagert/fix_emulator_upgrades: Fix boot file generation for intermediate releases.
2013-12-05Merge branch 'hans/inets/ftpc_test_fail' into maintHans Nilsson
* hans/inets/ftpc_test_fail: inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail
2013-12-05inets: Restore ftp test files for the inets_{,sup_}SUITE to not failHans Nilsson
2013-12-05Merge branch 'ia/inets/cuddle-with-tests' into maintIngela Anderton Andin
* ia/inets/cuddle-with-tests: inets: Add crypto start check to ssl test cases
2013-12-04Merge branch 'peppe/common_test/r16b03_docs_updated' into maintPeter Andersson
* peppe/common_test/r16b03_docs_updated: Update event handling documentation OTP-11524
2013-12-04Update event handling documentationPeter Andersson
2013-12-04Merge branch 'peppe/common_test/r16b03_docs' into maintPeter Andersson
* peppe/common_test/r16b03_docs: Update documentation OTP-10631 OTP-11305 OTP-11523 OTP-11524
2013-12-04Merge branch 'anders/diameter/doc/OTP-11519' into maintAnders Svensson
* anders/diameter/doc/OTP-11519: Assorted doc fixes/tweaks
2013-12-03Update documentationPeter Andersson
2013-12-03Assorted doc fixes/tweaksAnders Svensson
2013-12-03Merge branch 'hans/ssh/cli_delays' into maintHans Nilsson
* hans/ssh/cli_delays: ssh: Fix long cli delays. (Part of OTP-11339, OTP-10953)