aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-09-12Merge branch 'margnus1/dialyzer/fix_maps_opaque/ERL-249/PR-1161/OTP-13878' ↵Hans Bolinder
into maint * margnus1/dialyzer/fix_maps_opaque/ERL-249/PR-1161/OTP-13878: erl_bif_types: Properly unopaque maps:merge/2 args
2016-09-10Merge branch 'ingela/snmp/app-test' into maintIngela Anderton Andin
* ingela/snmp/app-test: snmp: Uncomment compiler files in app.src file snmp: Use built-in support for testing application files
2016-09-10snmp: Uncomment compiler files in app.src fileIngela Anderton Andin
The files are not used in runtime of the snmp app, but they are still part of the application and beam files are generated. Not including them will make the general app test fail.
2016-09-10snmp: Use built-in support for testing application filesIngela Anderton Andin
2016-09-10Merge branch 'ingela/diameter/cuddle-tests' into maintIngela Anderton Andin
* ingela/diameter/cuddle-tests: diameter: Do not test SCTP on sparc-sun-solaris2.10
2016-09-10diameter: Do not test SCTP on sparc-sun-solaris2.10Ingela Anderton Andin
The SCPT stack has a different behavior in solaris2.10 then in later versions and linux. Diameter implementation does not support this behavior.
2016-09-09Merge branch 'rickard/nif-restore-current/OTP-13877' into maintRickard Green
* rickard/nif-restore-current/OTP-13877: Fix restore of 'current' field when rescheduled NIF completes
2016-09-09Fix restore of 'current' field when rescheduled NIF completesRickard Green
2016-09-07Merge branch 'michaesc/crypto/honour-OPENSSL_NO_DES/ERL-203/OTP-13783' into ↵Raimo Niskanen
maint * michaesc/crypto/honour-OPENSSL_NO_DES/ERL-203/OTP-13783: Add '_cfb' alias for misspelled '_cbf' cipher Fix badarg -> notsup and test cases Honour OPENSSL_NO_DES Conflicts: lib/crypto/c_src/crypto.c
2016-09-07erl_bif_types: Properly unopaque maps:merge/2 argsMagnus Lång
erl_bif_types:type/5 was calling erl_types:map_pairwise_merge/3 directly with its (potentially opaque) arguments, causing Dialyzer crashes. Bug (ERL-249) reported and minimised test case provided by Felipe Ripoll.
2016-09-07Merge branch 'egil/hipe/fix-match-order-opaque-types/OTP-13876' into maintBjörn-Egil Dahlberg
* egil/hipe/fix-match-order-opaque-types/OTP-13876: hipe: Fix erl_types opaque match order
2016-09-07Merge branch 'egil/erts/start-scripts-dependency/ERL-241/OTP-13871' into maintBjörn-Egil Dahlberg
* egil/erts/start-scripts-dependency/ERL-241/OTP-13871: erts: Fix start scripts generation dependency in Makefile
2016-09-07Merge branch 'bjorn/compiler/lc-internal-failure/OTP-13863' into maintBjörn Gustavsson
* bjorn/compiler/lc-internal-failure/OTP-13863: sys_core_fold: Don't move a fun into a guard
2016-09-07Merge branch 'lars/utf-8-path-bugs/ERL-179/OTP-13718' into maintLars Thorsen
* lars/utf-8-path-bugs/ERL-179/OTP-13718: [snmp] Correct bug when path to mib contains UTF-8 characters [ic] Fix but when UTF-8 character in path to idl spec
2016-09-07[snmp] Correct bug when path to mib contains UTF-8 charactersLars Thorsen
2016-09-07[ic] Fix but when UTF-8 character in path to idl specLars Thorsen
The path is only used when writing a comment so the correction just allowed UTF-8 characters in that io_lib:format call. IC don't support UTF-8 in the specs or their names (generated modules contains coding: latin-1) but the path is only used in a comment so it's not a problem if it can't be written correctly as long as nothing fails.
2016-09-07Merge branch 'peppe/stdlib/zip-security-flaw/OTP-13633' into maintPeter Andersson
OTP-13633
2016-09-07Merge branch 'ingela/ssl/ssl_basic_SUITE-timeouts' into maintIngela Anderton Andin
* ingela/ssl/ssl_basic_SUITE-timeouts: ssl: Tune timeout ssl: Consistent timeout handling
2016-09-07ssl: Tune timeoutIngela Anderton Andin
2016-09-07ssl: Consistent timeout handlingIngela Anderton Andin
init_per_testcase timeout for renegotiation tests would be overridden by local timeout in test case help function.
2016-09-06Bump inets versionRaimo Niskanen
2016-09-06Merge branch 'ingela/ssl/dtls-progress/connection-states-as-maps' into maintIngela Anderton Andin
* ingela/ssl/dtls-progress/connection-states-as-maps: dtls: fix encoding of client hello cookie dtls: Prepare start of DTLS connection manager with SSL app ssl: Refactor to use maps for the connection states ssl, dtls: Refactor sni handling dtls: Add close/5 dtls: Add renegotiate/2 dtls: Add protocol event handling ssl: Refactor code so that tls and dtls can share more code ssl, dtls: Disable V2 compatibility clause from ssl_handshake:update_handshake_history ssl: Make sure common code for TLS and DTLS uses the TLS Version ssl: remove unused RecordCB argument from master_secret dtls: Add reinit_handshake_data/1 to dtls dtls: replace tls_record with RecordCB in connection_info Fix version numbers and dependencies
2016-09-06Merge branch 'sverker/beam-too-few-functions/ERL-244/OTP-13848' into maintSverker Eriksson
* sverker/beam-too-few-functions/ERL-244: erts: Reject beam file with too few functions
2016-09-06erts: Fix start scripts generation dependency in MakefileBjörn-Egil Dahlberg
Reported-by: Kent Fredric
2016-09-06Merge branch 'hans/ssh/keyboard_interactive_defensics' into maintHans Nilsson
2016-09-06Merge branch 'hans/ssh/strengthen_pubkey/OTP-13847' into maintHans Nilsson
Conflicts: lib/ssh/src/ssh_auth.erl
2016-09-06Merge branch 'hans/ssh/correct_sha_ecdsa/OTP-13850' into maintHans Nilsson
2016-09-06Merge branch 'hans/ssh/channel_no_detect_close/OTP-13859' into maintHans Nilsson
2016-09-06Merge branch 'hasse/doc/format_man_pages_utf8' into maintHans Bolinder
* hasse/doc/format_man_pages_utf8: doc: Use groff with -Tutf8
2016-09-06Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maintRickard Green
* rickard/thr-prgr-unmanaged-delay-bug/OTP-13869: Fix erts_thr_progress_unmanaged_delay()
2016-09-06Merge branch 'rickard/drv-send-term-thr-bug/OTP-13866' into maintRickard Green
* rickard/drv-send-term-thr-bug/OTP-13866: Fix thread calls to erl_drv_send_term()/erl_drv_output_term() Conflicts: erts/emulator/beam/io.c
2016-09-06doc: Use groff with -Tutf8Hans Bolinder
2016-09-06Merge branch 'ingela/ssl/ssl_to_openssl_SUITE' into maintIngela Anderton Andin
* ingela/ssl/ssl_to_openssl_SUITE: ssl: Make sure to have correct default
2016-09-06Merge branch 'lukas/ts/no_flush_on_halt' into maintLukas Larsson
* lukas/ts/no_flush_on_halt: ts: Don't flush port when ending test run
2016-09-06Merge branch 'hasse/kernel/doc-fix' into maintHans Bolinder
* hasse/kernel/doc-fix: kernel: Correct file(3)
2016-09-06kernel: Correct file(3)Hans Bolinder
2016-09-05Fix erts_thr_progress_unmanaged_delay()Rickard Green
Thread progress leader update did not cache current unmanaged index when waiting for unmanaged threads. This caused erts_thr_progress_unmanaged_delay() to stop working until a new leader took over.
2016-09-05Merge branch 'lukas/erts/epmd_xmllint_fix' into maintLukas Larsson
* lukas/erts/epmd_xmllint_fix: epmd: Fix xmllint error in comsummary
2016-09-05Merge branch 'lukas/erts/fix_signalhandler_errno_restore/OTP-13868' into maintLukas Larsson
* lukas/erts/fix_signalhandler_errno_restore/OTP-13868: erts: Fix child setup signal hander bug
2016-09-05Merge branch 'lukas/kernel/os_cmd_fix_stdin_close/OTP-13867' into maintLukas Larsson
* lukas/kernel/os_cmd_fix_stdin_close/OTP-13867: kernel: Close stdin of commands run in os:cmd
2016-09-05Merge branch 'lukas/kernel/fix_os_SUITE_message_leak_testcase/OTP-13867' ↵Lukas Larsson
into maint * lukas/kernel/fix_os_SUITE_message_leak_testcase/OTP-13867: kernerl: Remove infinite loop from testcase
2016-09-05Merge branch 'lukas/erts/tracing/fix_sparc_align_issue/OTP-13803' into maintLukas Larsson
* lukas/erts/tracing/fix_sparc_align_issue/OTP-13803: erts: Immed tracer states also have to be alignable
2016-09-05Fix thread calls to erl_drv_send_term()/erl_drv_output_term()Rickard Green
2016-09-05erts: Reject beam file with too few functionsSverker Eriksson
2016-09-05Add test case in zip_SUITEPeter Andersson
2016-09-05hipe: Fix erl_types opaque match orderBjörn-Egil Dahlberg
2016-09-05dtls: fix encoding of client hello cookieAndreas Schultz
2016-09-05dtls: Prepare start of DTLS connection manager with SSL appAndreas Schultz
2016-09-05ssl: Refactor to use maps for the connection statesIngela Anderton Andin
2016-09-05ssl, dtls: Refactor sni handlingIngela Anderton Andin
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 14:52:32 +0000