aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-12-04Merge branch 'maint'Raimo Niskanen
Conflicts: lib/ssl/test/ssl_dist_bench_SUITE.erl
2018-12-04Merge branch 'raimo/ssl/tls_dist-optimization' into maintRaimo Niskanen
* raimo/ssl/tls_dist-optimization: Handle socket close in state downgrade Handle dead sender at terminate Handle tls_sender exit properly Optimize split_bin Improve dist send throughput
2018-12-04Merge branch 'raimo/ssl/tls_dist-profiling' into maintRaimo Niskanen
* raimo/ssl/tls_dist-profiling: Improve benchmark Implement print on other node Fix compiler warnings
2018-12-04Merge branch 'maint'Ingela Anderton Andin
2018-12-04Merge branch 'ingela/ssl/test-cuddle-ssl_basic_SUITE' into maintIngela Anderton Andin
* ingela/ssl/test-cuddle-ssl_basic_SUITE: ssl: Correct test case
2018-12-04Handle socket close in state downgradeRaimo Niskanen
2018-12-04Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
2018-12-04Merge branch 'ingela/ssl/dist/active-N/OTP-15449' into maintIngela Anderton Andin
* ingela/ssl/dist/active-N/OTP-15449: ssl: Fix error handling in function passive_receive ssl: Correct ssl:shutdown ssl: Internaly use {active, N}
2018-12-03ssl: Fix error handling in function passive_receiveIngela Anderton Andin
Also avoid code duplication Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/tls_connection.erl
2018-12-03ssl: Correct ssl:shutdownIngela Anderton Andin
When internaly using active N, bugs in shutdown implementation where reveled.
2018-12-03ssl: Internaly use {active, N}Ingela Anderton Andin
Make next_record an internal help function to next_event and avoid duplicate calls to tls_socket:setopts for setting the active option.
2018-12-03ssl: Correct test caseIngela Anderton Andin
2018-12-03Merge branch 'maint'Henrik Nord
2018-12-03Update preloaded modulesHenrik Nord
2018-12-03Update primary bootstrapHenrik Nord
2018-12-03Merge branch 'maint'Lukas Larsson
2018-12-03Merge branch 'lukas/erts/CFLAGS-O-check/OTP-15465' into maintLukas Larsson
* lukas/erts/CFLAGS-O-check/OTP-15465: erts: Fix some 32-bit gcc warnings erts: Add check that a -O flag is present in CFLAGS
2018-12-03erts: Fix some 32-bit gcc warningsLukas Larsson
2018-12-03erts: Add check that a -O flag is present in CFLAGSLukas Larsson
There have been too many times when users have needed to enable something through CFLAGS but forgotten to add the '-O2 -g' flags.
2018-12-03Merge branch 'maint'Sverker Eriksson
2018-12-03Merge branch 'sverker/erts/sendfile-error-bug/ERL-784/OTP-15461' into maintSverker Eriksson
* sverker/erts/sendfile-error-bug/ERL-784/OTP-15461: erts: Fix hanging sendfile bugs when socket closes unexpectedly erts: Fix unexpected inet_reply message from failing file:sendfile erts: Fix bug in sendfile for active socket
2018-12-03Merge branch 'maint'Sverker Eriksson
2018-12-03Merge branch 'sverker/erts/cuddle-driver_SUITE' into maintSverker Eriksson
* sverker/erts/cuddle-driver_SUITE: erts: Fix faulty assert in driver_SUITE erts: Improve driver_SUITE:smp_select
2018-12-03Merge branch 'maint'Siri Hansen
2018-12-03Merge branch 'siri/logger/std-recreate-file-if-rotated/OTP-15469' into maintSiri Hansen
* siri/logger/std-recreate-file-if-rotated/OTP-15469: [logger] Re-create log file if deleted
2018-12-03Merge branch 'maint'Siri Hansen
2018-12-03Merge branch 'siri/logger/unexpected-exit-from-simple/ERL-788/OTP-15466' ↵Siri Hansen
into maint * siri/logger/unexpected-exit-from-simple/ERL-788/OTP-15466: [logger] Unlink simple handler before terminating
2018-12-03Merge branch 'maint'Siri Hansen
2018-12-03Merge branch 'maint'Dan Gudmundsson
* maint: unicode_util did not handle binary input data correctly
2018-12-03Merge branch 'siri/et/scroll-up/ERL-780/OTP-15463' into maintSiri Hansen
* siri/et/scroll-up/ERL-780/OTP-15463: [et] Improve handling of scroll bar
2018-12-03Merge branch 'dgud/stdlib/unicode-binary-bug/ERL-777/OTP-15428' into maintDan Gudmundsson
* dgud/stdlib/unicode-binary-bug/ERL-777/OTP-15428: unicode_util did not handle binary input data correctly
2018-12-03Merge branch 'maint'Raimo Niskanen
2018-12-03Merge branch 'raimo/test-cuddling' into maintRaimo Niskanen
* raimo/test-cuddling: Parallel stress test strong_rand_bytes Update OS version numbers
2018-12-03Merge branch 'maint'Hans Nilsson
* maint: crypto: Engine valgrind fix crypto: Fix valgrind error in dh_generate/dh_compute crypto: Fix valgrind errors in pkey_crypt_nif crypto: Add some crypto:engine_unload in engine test suite crypto: Fix valgrind errors in privkey_to_pubkey crypto: Fix valgrind error for keys with passwords in Engines
2018-12-03Merge branch 'hans/crypto/valgrind-warnings/OTP-15467' into maintHans Nilsson
* hans/crypto/valgrind-warnings/OTP-15467: crypto: Engine valgrind fix crypto: Fix valgrind error in dh_generate/dh_compute crypto: Fix valgrind errors in pkey_crypt_nif crypto: Add some crypto:engine_unload in engine test suite crypto: Fix valgrind errors in privkey_to_pubkey crypto: Fix valgrind error for keys with passwords in Engines
2018-12-03crypto: Engine valgrind fixHans Nilsson
Fixes memory leak when a command has wrong type.
2018-12-03crypto: Fix valgrind error in dh_generate/dh_computeHans Nilsson
2018-12-03crypto: Fix valgrind errors in pkey_crypt_nifHans Nilsson
2018-12-03crypto: Add some crypto:engine_unload in engine test suiteHans Nilsson
Got valgrind errors for error tests otherwise
2018-12-03crypto: Fix valgrind errors in privkey_to_pubkeyHans Nilsson
2018-12-03crypto: Fix valgrind error for keys with passwords in EnginesHans Nilsson
2018-12-03Merge branch 'maint'Dan Gudmundsson
* maint: wx: Do not delay deletes of wxGraphicContext
2018-12-03Merge branch 'dgud/wx/mojave-crash/OTP-15426' into maintDan Gudmundsson
* dgud/wx/mojave-crash/OTP-15426: wx: Do not delay deletes of wxGraphicContext
2018-12-03Merge branch 'maint'Hans Bolinder
* maint: stdlib: Let calendar:system_time_to_rfc3339() keep fractions
2018-12-03Merge pull request #2036 from uabboli/hasse/stdlib/rfc3339_fraction/OTP-15464Hans Bolinder
stdlib: Let calendar:system_time_to_rfc3339() keep fractions
2018-11-30erts: Fix hanging sendfile bugs when socket closes unexpectedlySverker Eriksson
2018-11-30[logger] Re-create log file if deletedSiri Hansen
This is an update to logger_std_h, which makes it play well with tools like logrotate.
2018-11-30Handle dead sender at terminateRaimo Niskanen
2018-11-30Handle tls_sender exit properlyRaimo Niskanen
2018-11-30Improve benchmarkRaimo Niskanen