aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-04-28Update primary bootstrapHans Bolinder
2014-04-28Merge branch 'hb/optional_callbacks/OTP-11861'Hans Bolinder
* hb/optional_callbacks/OTP-11861: [edoc] Handle optional behaviour callbacks [syntax_tools] Let erl_syntax:concrete() accept the F/A syntax Introduce the attribute -optional_callbacks in the context of behaviours
2014-04-28[edoc] Handle optional behaviour callbacksHans Bolinder
2014-04-28[syntax_tools] Let erl_syntax:concrete() accept the F/A syntaxHans Bolinder
Note: `arity_qualifier` nodes are recognized. This is to follow The Erlang Parser when it comes to wild attributes: both {F, A} and F/A are recognized, which makes it possible to turn wild attributes into recognized attributes without at the same time making it impossible to compile files using the new syntax with the old version of the Erlang Compiler.
2014-04-28Introduce the attribute -optional_callbacks in the context of behavioursHans Bolinder
2014-04-25Merge branch 'maint'Hans Nilsson
* maint: ssh: Doc change on max_session param ssh: Add max_session parameter to ssh:daemon ssh: remove confusing info in some reports
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 'maint'Hans 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 remote-tracking branch 'upstream/maint'Ingela Anderton Andin
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 remote-tracking branch 'upstream/maint'Ingela 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-23Merge branch 'hans/ssl/ssl_crl_SUITE/win_connect_failure'Hans Nilsson
* hans/ssl/ssl_crl_SUITE/win_connect_failure: ssl: Fixes ssl_crl_SUITE errors on mixed ipv6-v4 interfaces
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-23Merge branch 'maint'Siri Hansen
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-23ssl: Fixes ssl_crl_SUITE errors on mixed ipv6-v4 interfacesHans Nilsson
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 'maint'Siri Hansen
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 'maint'Ingela Anderton Andin
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 'maint'Ingela Anderton Andin
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 'maint'Hans Bolinder
* maint: hipe, dialyzer: Fix a bug concerning opaque types
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 'maint'Hans Bolinder
* maint: stdlib: Fix error message when exporting (redefined) map() type
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-14[reltool] Adapt tests to better quoting of paths on windowsSiri Hansen
2014-04-14Merge branch 'maint'Hans Bolinder
* maint: Correct the name of a compiler option and fix the corresponding warnings
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