aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-01-23Merge branch 'sverker/ASSERT_IN_ENV'Sverker Eriksson
* sverker/ASSERT_IN_ENV: erts: Add macro ERTS_PROC_LOCKS_HIGHER_THAN erts: Cleanup and extra assertions in nif_SUITE.c erts: Cleanup enif_make_reverse_list erts: Add assertions for correct ErlNifEnv erts: Make erts_dbg_within_proc available # Conflicts: # erts/emulator/beam/erl_gc.h
2017-01-23Merge branch 'hans/ssh/optimize/OTP-14160'Hans Nilsson
2017-01-20Merge branch 'maint'Hans Nilsson
2017-01-20Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-01-20Merge branch 'maint'Björn-Egil Dahlberg
2017-01-20Merge branch 'egil/cuddle-more-tests' into maintBjörn-Egil Dahlberg
* egil/cuddle-more-tests: runtime_tools: Fix utf-8 encoding in LTTng.xml Handle unicode in path in test
2017-01-19ssh: fix mpint-bug in property testsHans Nilsson
2017-01-19Merge branch 'hans/ssh/benchmarks'Hans Nilsson
2017-01-19Merge branch 'maint'Hans Nilsson
2017-01-19Merge branch 'hans/ssh/reduce_decrypt_error_info_leakage/OTP-14109' into maintHans Nilsson
2017-01-19Merge branch 'rickard/proc-lookup-inc-refc'Rickard Green
* rickard/proc-lookup-inc-refc: Introduce erts_proc_lookup_inc_refc()
2017-01-19Introduce erts_proc_lookup_inc_refc()Rickard Green
2017-01-18ssh: increased benchmark suite timetrapHans Nilsson
2017-01-18ssh: fixed benchmark bug for gcm-modesHans Nilsson
The bug has not affected existing results because no gcm-modes has been measured.
2017-01-18ssh: Reduce info leakage on decrypt errorsHans Nilsson
Use same message when there are packet errors like too long length, MAC, decrypt or decode errors. This is regarded as good practise to prevent some attacks
2017-01-18Merge branch 'maint'Raimo Niskanen
2017-01-18Merge branch 'raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145' into maintRaimo Niskanen
* raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145: Bump version Do without compilation time in SNMP versions[12]() Test enum refinement MIB Fix enum refinement in usertype in SYNTAX
2017-01-18Merge branch 'maint'Hans Nilsson
2017-01-18Merge pull request #1311 from leoliu/fix-ERL-336Hans Nilsson
Add a missing aes_gcm -spec clause to crypto:block_encrypt/4
2017-01-17Merge branch 'maint'Björn-Egil Dahlberg
2017-01-17Merge branch 'egil/cuddle-tests' into maintBjörn-Egil Dahlberg
* egil/cuddle-tests: stdlib: Increase timetrap for rand_SUITE common_test: Increase timetrap for cth_hooks_SUITE compiler: Increase timetrap timeouts for lc_SUITE
2017-01-17runtime_tools: Fix utf-8 encoding in LTTng.xmlBjörn-Egil Dahlberg
2017-01-17Merge branch 'maint'Sverker Eriksson
2017-01-17Merge branch 'sverker/trace_gc-bug/OTP-14154' into maintSverker Eriksson
* sverker/trace_gc-bug: erts: Fix GC tracing to use temp heap erts: Assert sufficient space need after GC
2017-01-17Handle unicode in path in testBjörn-Egil Dahlberg
2017-01-17Bump versionRaimo Niskanen
2017-01-17Do without compilation time in SNMP versions[12]()Raimo Niskanen
2017-01-17Merge branch 'maint'Rickard Green
* maint: Remove debug printout and unnecessary GC
2017-01-17Merge branch 'rickard/hipe_handle_exception' into maintRickard Green
OTP-14153 * rickard/hipe_handle_exception: Remove debug printout and unnecessary GC
2017-01-17Remove debug printout and unnecessary GCRickard Green
2017-01-17Merge branch 'maint'Hans Nilsson
2017-01-17Merge pull request #1308 from philipcristiano/file_apiHans Nilsson
ssh: Correct ssh_sftpd_file_api dialzyer spec
2017-01-17Merge branch 'rickard/ds-features-20'Rickard Green
OTP-14152 * rickard/ds-features-20: Remove experimental disclaimer on dirty schedulers Scheduler wall time support for dirty schedulers Always return info from system_info(dirty_[cpu|io]_schedulers*) Improve etp-commands Switch between scheduler types when multi-scheduling is blocked Perform potentially long GC on dirty schedulers if available Return and exception trace for nif-export scheduled BIFs Optimize handling of BIF errors Support for dirty BIFs Reduction counting on non-tail return
2017-01-17Merge branch 'maint'Rickard Green
* maint: Do not automatically define HARDDEBUG when DEBUG is defined
2017-01-17Merge branch 'rickard/no-harddebug' into maintRickard Green
* rickard/no-harddebug: Do not automatically define HARDDEBUG when DEBUG is defined
2017-01-17Merge branch 'maint'Rickard Green
* maint: Fix memory leak of temporary heap
2017-01-17Merge branch 'rickard/abandoned-heap-bugs' into maintRickard Green
OTP-14135 * rickard/abandoned-heap-bugs: Fix memory leak of temporary heap
2017-01-17Remove experimental disclaimer on dirty schedulersRickard Green
2017-01-17Scheduler wall time support for dirty schedulersRickard Green
2017-01-17Always return info from system_info(dirty_[cpu|io]_schedulers*)Rickard Green
2017-01-17Merge branch 'maint'Ingela Anderton Andin
2017-01-17Merge branch 'ingela/ssl/hs-stream/OTP-14138' into maintIngela Anderton Andin
* ingela/ssl/hs-stream/OTP-14138: ssl: Handle really big handshake packages
2017-01-17ssl: Handle really big handshake packagesIngela Anderton Andin
If a handshake message is really big it could happen that the ssl process would hang due to failing of requesting more data from the socket. This has been fixed. Also added option to limit max handshake size. It has a default value that should be big enough to handle normal usage and small enough to mitigate DoS attacks.
2017-01-17Add a missing aes_gcm -spec clause to crypto:block_encrypt/4Leo Liu
Fix https://bugs.erlang.org/browse/ERL-336.
2017-01-16Merge branch 'maint'Sverker Eriksson
2017-01-16Merge branch 'maint-19' into maintSverker Eriksson
2017-01-16Merge pull request #1307 from bjorng/bjorn/asn1/remove-deprecated/OTP-14146Björn Gustavsson
asn1: Remove deprecated functions OTP-14146
2017-01-13Improve etp-commandsRickard Green
2017-01-13Switch between scheduler types when multi-scheduling is blockedRickard Green
2017-01-13Do not automatically define HARDDEBUG when DEBUG is definedRickard Green
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 06:40:17 +0000