aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-05-05Merge branch 'lukas/erts/suspend_assert/OTP-11906' into maintLukas Larsson
* lukas/erts/suspend_assert/OTP-11906: erts: Fix faulty process suspend assert
2014-05-05erts: Fix faulty process suspend assertLukas Larsson
2014-05-05Merge branch 'lukas/erts/etp-lc-macros/OTP-11904' into maintLukas Larsson
* lukas/erts/etp-lc-macros/OTP-11904: erts: Add etp-lc-dump and etp-ppc-stacktrace macro
2014-05-05Merge branch 'lukas/kernel/fix_sendfile_no_async_tests/OTP-11903' into maintLukas Larsson
* lukas/kernel/fix_sendfile_no_async_tests/OTP-11903: kernel: Skip sendfile tests that force async threads
2014-05-02Merge remote branch 'origin/peppe/common_test/ct_comment_problem' into maintPeter Andersson
* origin/peppe/common_test/ct_comment_problem: Fix problem with comments getting lost when running parallel test cases
2014-05-02Merge remote branch 'origin/peppe/common_test/telnet_reversed_strings' into ↵Peter Andersson
maint * origin/peppe/common_test/telnet_reversed_strings: Fix problem with send printout not being tagged with connection name Fix problem with substring in large message getting incorrectly reversed OTP-11871
2014-04-30Fix problem with comments getting lost when running parallel test casesPeter Andersson
OTP-11898
2014-04-29Merge branch 'sverk/test-cuddle' into maintSverker Eriksson
* sverk/test-cuddle: Fix timeout for match_spec_SUITE:otp_9422
2014-04-29Fix timeout for match_spec_SUITE:otp_9422Sverker Eriksson
Must receive 'abort' even after loop_runner has finished.
2014-04-28Merge branch 'nox/fix-silent-rules' into maintBjörn-Egil Dahlberg
* nox/fix-silent-rules: Silence an echo in Makefile.in
2014-04-25Merge branch 'hans/ssh/max_sessions/OTP-11885' into maintHans Nilsson
* hans/ssh/max_sessions/OTP-11885: ssh: Doc change on max_session param ssh: Add max_session parameter to ssh:daemon
2014-04-25Merge branch 'hans/ssh/error_msg/OTP-11883' into maintHans Nilsson
* hans/ssh/error_msg/OTP-11883: ssh: remove confusing info in some reports
2014-04-24ssh: Doc change on max_session paramHans Nilsson
2014-04-24ssh: Add max_session parameter to ssh:daemonHans Nilsson
2014-04-24ssh: remove confusing info in some reportsHans Nilsson
2014-04-24Merge branch 'hans/ssl/ssl_crl_SUITE/win_connect_failure_b' into maintHans Nilsson
2014-04-24ssl: Fixes ssl_crl_SUITE errors on mixed ipv6-v4 interfacesHans Nilsson
2014-04-24Merge branch 'ia/ssl/remove-otdated-doc' into maintIngela Anderton Andin
* ia/ssl/remove-otdated-doc: ssl: Remove outdated documentation
2014-04-24ssl: Remove outdated documentationIngela Anderton Andin
2014-04-24Merge branch 'ia/pr/339' into maintIngela Anderton Andin
* ia/pr/339: ssl: Fix crash on garbage during handshake
2014-04-24Merge branch 'ia/pr/340' into maintIngela Anderton Andin
* ia/pr/340: ssl: Refactor so that there is only one source for the default hashsign values ssl: always pass negotiated version when selecting hashsign ssl: TLSv1.2: proper default sign algo for RSA
2014-04-23ssl: Fix crash on garbage during handshakeDanil Zagoskin
If a client sends some garbage in ssl record instead of valid fragment, server crashes with function_clause while receiving next record from client. This patch makes server raise handshake failure instead of crashing and exposing internal state to user code.
2014-04-23ssl: Refactor so that there is only one source for the default hashsign valuesIngela Anderton Andin
Also fix DTLS call to supply its corresponding TLS version
2014-04-23ssl: always pass negotiated version when selecting hashsignDanil Zagoskin
Negotiated version is now always passed to ssl_handshake:select_hashsign because ssl_handshake:select_cert_hashsign has different rsa defaults on tlsv1.2 and older versions.
2014-04-23ssl: TLSv1.2: proper default sign algo for RSADanil Zagoskin
2014-04-22Merge branch 'siri/ac-change_app_data/OTP-11864' into maintSiri Hansen
* siri/ac-change_app_data/OTP-11864: Store expanded config in application_controller:change_application_data
2014-04-22Merge branch 'siri/kernel_app-doc-links/OTP-11862' into maintSiri Hansen
* siri/kernel_app-doc-links/OTP-11862: Add hyperlinks to modules in reference manual for kernel application
2014-04-22Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [reltool] Adapt tests to better quoting of paths on windows [reltool] Increase timetrap timeout to handle slow test machines Skip test when needed applications are missing Don't allow slave nodes to survive their test case
2014-04-22Merge branch 'ia/ssl/decrypt-alert/OTP-11880' into maintIngela Anderton Andin
* ia/ssl/decrypt-alert/OTP-11880: ssl: Correct decryption error handling
2014-04-22Merge branch 'ia/ssl/recv/OTP-11878' into maintIngela Anderton Andin
* ia/ssl/recv/OTP-11878: ssl: recv shall ruturn {error, einval} on active socket
2014-04-22Merge branch 'ia/ssl/suites-match-negotiated-version/OTP-11875' into maintIngela Anderton Andin
* ia/ssl/suites-match-negotiated-version/OTP-11875: ssl: Select supported cipher suites for the negotiated SSL/TLS-version
2014-04-22Merge branch 'ia/ssl/warning-alert/OTP-11874' into maintIngela Anderton Andin
* ia/ssl/warning-alert/OTP-11874: ssl: Graceful handling of warning alerts
2014-04-17ssl: Correct decryption error handlingIngela Anderton Andin
2014-04-17ssl: recv shall ruturn {error, einval} on active socketIngela Anderton Andin
2014-04-17ssl: Graceful handling of warning alertsIngela Anderton Andin
Generalize last warning alert function clause
2014-04-17Merge branch 'hb/dialyzer/bugfix_opaque/OTP-11869' into maintHans Bolinder
* hb/dialyzer/bugfix_opaque/OTP-11869: hipe, dialyzer: Fix a bug concerning opaque types
2014-04-17hipe, dialyzer: Fix a bug concerning opaque typesHans Bolinder
Dialyzer sometimes output warnings like Attempt to test for inequality between a term of type 'false' and a term of opaque type 'false' | gb_set() The reason was that erl_types:t_inf/3 when called from erl_types:t_find_unknown_opaque() did not return 'false' but found the mismatch. It should not return the mismatch unless the intersection is empty ('none'). Thanks to Shayan Pooya [[email protected]] for pointing out the bug.
2014-04-17Merge branch 'hb/stdlib/map_type_fix/OTP-11872' into maintHans Bolinder
* hb/stdlib/map_type_fix/OTP-11872: stdlib: Fix error message when exporting (redefined) map() type
2014-04-16ssl: Select supported cipher suites for the negotiated SSL/TLS-versionIngela Anderton Andin
When selecting the available cipher suites for the server all cipher suites for the highest supported SSL/TLS-version would be selected, and not all supported for the negotiated SSL/TLS-version. This could lead to that faulty clients could negotiate cipher suites that they can not support. This change will enable the faulty client to negotiate another cipher suite that it can support.
2014-04-16stdlib: Fix error message when exporting (redefined) map() typeHans Bolinder
When redefining and exporting the type map() erl_lint erroneously emitted an error. This bug has been fixed.
2014-04-16Fix problem with send printout not being tagged with connection namePeter Andersson
2014-04-16Fix problem with substring in large message getting incorrectly reversedPeter Andersson
OTP-11871
2014-04-15Silence an echo in Makefile.inAnthony Ramine
2014-04-14[reltool] Adapt tests to better quoting of paths on windowsSiri Hansen
2014-04-14Merge branch 'kostis/dialyzer-warn_export_vars' into maintHans Bolinder
* kostis/dialyzer-warn_export_vars: Correct the name of a compiler option and fix the corresponding warnings
2014-04-14Merge branch 'ia/inets/test-remove-hard-coded-httpd-port' into maintIngela Anderton Andin
* ia/inets/test-remove-hard-coded-httpd-port: inets: Cleaned up inets_sup_SUITE - removing hard coded port for httpd
2014-04-14inets: Cleaned up inets_sup_SUITE - removing hard coded port for httpdIngela Anderton Andin
2014-04-11Store expanded config in application_controller:change_application_dataSiri Hansen
If the Config given to application_controller:change_application_data included other config files, it was only expanded for already existing (loaded) applications. If an upgrade added a new application which had config data in an included config file, the new application did not get correct config data. This is now changed so config data will be expanded for all applications.
2014-04-10Merge branch 'maint-17' into maintSverker Eriksson
Conflicts: OTP_VERSION erts/vsn.mk
2014-04-10Development versionsSverker Eriksson