aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-09-12Merge branch 'maint'Sverker Eriksson
2014-09-12Merge branch 'sverk/dirty-sched-api-cleanup' into maintSverker Eriksson
* sverk/dirty-sched-api-cleanup: erts: Remove enif_have_dirty_schedulers() erts: Correct dirty scheduler NIF API for Windows
2014-09-12erts: Remove enif_have_dirty_schedulers()Sverker Eriksson
and add 'dirty_scheduler_support' to ErlNifSysInfo
2014-09-11Merge branch 'maint'Ingela Anderton Andin
2014-09-11Merge branch 'ia/public_key/links' into maintIngela Anderton Andin
* ia/public_key/links: public_key: Fix link errors in documentation
2014-09-11public_key: Fix link errors in documentationIngela Anderton Andin
2014-09-11Update preloadedMarcus Arendt
2014-09-11Merge branch 'maint'Marcus Arendt
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2014-09-11Update preloadedMarcus Arendt
2014-09-11Merge branch 'lrascao/fix_bug_windows_directory_symlinks' into maintMarcus Arendt
* lrascao/fix_bug_windows_directory_symlinks: fix indentation, add comment describing windows symlink creation assumption fix escript archive symlinked across drives OTP-12155 OTP-12154 OTP-12153
2014-09-10Merge branch 'maint'Dan Gudmundsson
2014-09-10Merge branch 'dgud/tools/emacs-fix' into maintDan Gudmundsson
* dgud/tools/emacs-fix: Add new bif to emacs mode
2014-09-10Merge branch 'maint'Raimo Niskanen
2014-09-10Merge branch 'raimo/snmp/manager-ipv4+ipv6/OTP-12108' into maintRaimo Niskanen
* raimo/snmp/manager-ipv4+ipv6/OTP-12108: Remove debug printouts Fix manager backwards compat for agent addr Update .appup Update documentation Clean up some config warts Raise timeout and see if testcases stabilize Merge manager net_if_mt into net_if Clean up config error handling and negative results Remove decommented code and clean up diff Implement IPv4+IPv6 in MT manager Avoid test case known to fail Improve testcase test for IPv6 capable host Write manager IPv4+IPv6 test Rewrite manager net_if for IPv4+IPv6
2014-09-10erts: Correct dirty scheduler NIF API for WindowsSverker Eriksson
enif_schedule_nif() put LAST of the unconditional functions to keep the order which is vital for ABI compatibility on Windows. The conditional dirty scheduler stuff moved down at the end of the list to keep them out of the way. We don't want them mess things up then they become unconditional some day.
2014-09-10Merge branch 'maint'Ingela Anderton Andin
2014-09-10Merge branch 'ia/ssl/partial_chain/OTP-12149' into maintIngela Anderton Andin
* ia/ssl/partial_chain/OTP-12149: ssl: One more workaround as tcp has no delivery gurantee on application level ssl: Prepare for release - soft upgrade ssl, public_key: Add new option partial_chain
2014-09-10Merge branch 'maint'Lukas Larsson
* maint: Fix some spelling misstakes
2014-09-10Merge branch 'lukas/docfixes-17.3/OTP-12152' into maintLukas Larsson
* lukas/docfixes-17.3/OTP-12152: Fix some spelling misstakes
2014-09-10Merge branch 'maint'Ingela Anderton Andin
2014-09-10Merge branch 'ia/inets/appup' into maintIngela Anderton Andin
2014-09-10ssl: One more workaround as tcp has no delivery gurantee on application levelIngela Anderton Andin
2014-09-10ssl: Prepare for release - soft upgradeIngela Anderton Andin
2014-09-09Merge branch 'maint'Anders Svensson
2014-09-09Merge branch 'anders/diameter/17.3_release/OTP-12093' into maintAnders Svensson
* anders/diameter/17.3_release/OTP-12093: vsn -> 1.7.1 Update appup for OTP-12094 Update appup for OTP-12080 Update appup for OTP-12069
2014-09-09Merge branch 'anders/diameter/5014/OTP-12074' into maintAnders Svensson
* anders/diameter/5014/OTP-12074: Don't leave extra bit in decoded AVP data
2014-09-09Merge branch 'anders/diameter/Failed-AVP/OTP-12094' into maintAnders Svensson
* anders/diameter/Failed-AVP/OTP-12094: Fix best effort decode of Failed-AVP Fix decode of Failed-AVP in RFC 3588 answer-message
2014-09-09Merge branch 'anders/diameter/counters/OTP-12080' into maintAnders Svensson
* anders/diameter/counters/OTP-12080: Fix counters for answer-message Count relayed messages on {relay, Rbit} Count request retransmissions Fix counting of outgoing requests
2014-09-09Merge branch 'anders/diameter/info/OTP-12069' into maintAnders Svensson
* anders/diameter/info/OTP-12069: Map binary process info to a reference/byte count Add info item for diameter:service_info/2 Add (process) info tuple to diameter:service_info/2 Add diameter_dbg:sizes/0 Tweak comments
2014-09-09Merge branch 'maint'Sverker Eriksson
2014-09-09Merge branch 'sverk/crypto-check-version/OTP-12146' into maintSverker Eriksson
* sverk/crypto-check-version/OTP-12146: crypto: Verify OpenSSL library major version at load
2014-09-09Remove debug printoutsRaimo Niskanen
2014-09-09Fix manager backwards compat for agent addrRaimo Niskanen
2014-09-09Merge branch 'egil/erlang-get_keys/OTP-12151'Björn-Egil Dahlberg
* egil/erlang-get_keys/OTP-12151: Update preloaded erlang.beam erts: Document erlang:get_keys/0 stdlib: Auto-import erlang:get_keys/0 erts: Add spec for erlang:get_keys/0 kernel: Test BIF erlang:get_keys/0 erts: Add BIF erlang:get_keys/0
2014-09-09Merge branch 'maint'Henrik Nord
2014-09-09Merge branch 'fishcakez/dialyzer_beam_opts' into maintHenrik Nord
* fishcakez/dialyzer_beam_opts: Use compile options when dialyzing beam files
2014-09-09Add new bif to emacs modeDan Gudmundsson
2014-09-09Update .appupRaimo Niskanen
2014-09-09ssl, public_key: Add new option partial_chainIngela Anderton Andin
Check that the certificate chain ends with a trusted ROOT CA e.i. a self-signed certificate, but provide an option partial_chain to enable the application to define an intermediat CA as trusted. TLS RFC says: "unknown_ca A valid certificate chain or partial chain was received, but the certificate was not accepted because the CA certificate could not be located or couldn't be matched with a known, trusted CA. This message is always fatal." and also states: "certificate_list This is a sequence (chain) of certificates. The sender's certificate MUST come first in the list. Each following certificate MUST directly certify the one preceding it. Because certificate validation requires that root keys be distributed independently, the self-signed certificate that specifies the root certificate authority MAY be omitted from the chain, under the assumption that the remote end must already possess it in order to validate it in any case." X509 RFC says: "The selection of a trust anchor is a matter of policy: it could be the top CA in a hierarchical PKI, the CA that issued the verifier's own certificate(s), or any other CA in a network PKI. The path validation procedure is the same regardless of the choice of trust anchor. In addition, different applications may rely on different trust anchors, or may accept paths that begin with any of a set of trust anchors."
2014-09-09Merge branch 'maint'Hans Nilsson
* maint: ssh: update for triq tests common_test: ct_property_test call correct Triq function. ct_property_test: add Triq support
2014-09-09Merge branch 'hans/common_test/prop_test' into maintHans Nilsson
* hans/common_test/prop_test: ssh: update for triq tests common_test: ct_property_test call correct Triq function. ct_property_test: add Triq support
2014-09-09ssh: update for triq testsHans Nilsson
2014-09-09common_test: ct_property_test call correct Triq function.Hans Nilsson
2014-09-09ct_property_test: add Triq supportTuncer Ayaz
Also, ensure that the right module's counterexample/0 is called.
2014-09-08Don't leave extra bit in decoded AVP dataAnders Svensson
The bit is added in diameter_codec to induce a decode error in the case of 5014 errors, but was not removed before returning the decoded result. Code examining the binary data in a diameter_avp record would then see the extra bit.
2014-09-08vsn -> 1.7.1Anders Svensson
2014-09-08Update appup for OTP-12094Anders Svensson
diameter_codec must be loaded before diameter_traffic.
2014-09-08Update appup for OTP-12080Anders Svensson
2014-09-08Update appup for OTP-12069Anders Svensson
2014-09-08inets: Soft upgradeIngela Anderton Andin