aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2016-03-08Merge branch 'sverk/bad_printable_range' into maintSverker Eriksson
* sverk/bad_printable_range: stdlib: Fix io_SUITE:bad_printable_range for windows
2016-03-08Merge remote-tracking branch 'origin/dgud/wx/bugs' into maintDan Gudmundsson
* origin/dgud/wx/bugs: wx: Use wrapper classes where possible wx: Wait before throwing away early callbacks to wx_objects wx: Add wxWindow:SetTransparent and CanSetTransperant wx: Add wxWindow SetDoubleBuffered and IsDoubleBuffered from wxWidgets 3.0 wx: Remove http_util usage wx: Tiny optimization wx: Fix a crash with sending two binaries to command queue
2016-03-08Test windows registry in places we are allowed to writeDan Gudmundsson
Since Windows 8 we are not allowed (in non elevated mode) to write to hklm.
2016-03-07Merge branch 'anders/diameter/retransmission/OTP-13342' into maintAnders Svensson
* anders/diameter/retransmission/OTP-13342: Fix handling of shared peer connections in watchdog state SUSPECT Remove unnecessary parentheses Remove dead export
2016-03-07Merge branch 'anders/diameter/18/performance/OTP-13164' into maintAnders Svensson
* anders/diameter/18/performance/OTP-13164: Make peer handling more efficient Remove unnecessary erlang:monitor/2 qualification
2016-03-07stdlib: Fix io_SUITE:bad_printable_range for windowsSverker Eriksson
avoid os:cmd as it treats stderr different on windows.
2016-03-07Merge branch 'msantos/tftp-wrap-block-counter/PR-965' into maintRaimo Niskanen
* msantos/tftp-wrap-block-counter/PR-965: tftp: support transfer of files > 65535 blocks
2016-03-03asn1_SUITE_value: Don't test the LDAP moduleBjörn Gustavsson
asn1ct:test(Mod) will generate sample values for data types in an ASN.1 modules. The following definition from LDAP can cause problems for asn1ct:test/1: Filter ::= CHOICE { and [0] SET SIZE (1..MAX) OF filter Filter, or [1] SET SIZE (1..MAX) OF filter Filter, not [2] Filter, equalityMatch [3] AttributeValueAssertion, substrings [4] SubstringFilter, greaterOrEqual [5] AttributeValueAssertion, lessOrEqual [6] AttributeValueAssertion, present [7] AttributeDescription, approxMatch [8] AttributeValueAssertion, extensibleMatch [9] MatchingRuleAssertion, ... } If we were unlucky (which we were on some computers), the construction of sample values would not terminate. Eliminate the problem for now by not testing the LDAP module. This workaround should be removed when we have added some limitation to the recursion in asn1ct_value when generating values.
2016-03-02Merge branch 'legoscia/tls_ipv6_dist' into maintHenrik Nord
* legoscia/tls_ipv6_dist: Add inet6_tls_dist, for TLS distribution over IPv6 Conflicts: lib/ssl/src/ssl_tls_dist_proxy.erl OTP-13391
2016-03-02Merge branch 'ia/inets/httpd-gracefull-error/OTP-13389' into maintIngela Anderton Andin
* ia/inets/httpd-gracefull-error/OTP-13389: inets: No error reports for expected termination
2016-03-02Merge branch 'siri/ct_netconfc/log-open-close/OTP-13386' into maintSiri Hansen
* siri/ct_netconfc/log-open-close/OTP-13386: Log open and close of netconf connections
2016-03-02Merge branch 'ia/public_key/missinig-nl/OTP-13381' into maintIngela Anderton Andin
* ia/public_key/missinig-nl/OTP-13381: public_key: An encapsulated PEM header shall be followed by a blank line
2016-03-02Merge branch 'siri/crashdump-dir/OTP-13388' into maintSiri Hansen
* siri/crashdump-dir/OTP-13388: Set dir for slave node's erl_crash.dump
2016-03-01wx: Use wrapper classes where possibleDan Gudmundsson
2016-03-01Set dir for slave node's erl_crash.dumpSiri Hansen
This was earlier filename:dirname(code:which(test_server)). On Microsoft Windows, this pointed to a directory under c:/Program Files, and in later versions this directory is no longer writable. The framework (common_test) log dir is now used instead.
2016-03-01Merge branch 'sverk/halt-INT_MIN' into maintSverker Eriksson
OTP-13251 * sverk/halt-INT_MIN: erts: Make erlang:halt() accept bignums as Status erts: Change erl_exit into erts_exit kernel: Remove calls to erl_exit
2016-03-01Merge branch 'msantos/epmd-IPv6-node-reg2/PR-864/OTP-13364' into maintIngela Anderton Andin
* msantos/epmd-IPv6-node-reg2/PR-864/OTP-13364: epmd: support IPv6 node registration
2016-03-01wx: Wait before throwing away early callbacks to wx_objectsDan Gudmundsson
If synced callbacks arrive early before the return value from init had been synced to proc_lib. The callbacks where ignored. Added a short timeout to avoid the scheduling raise but we don't want block the wxe_server in case of deadlock in init, so sleep for a short while and check again, and drop the callback when init takes to long.
2016-03-01inets: No error reports for expected terminationIngela Anderton Andin
2016-03-01Log open and close of netconf connectionsSiri Hansen
Commit 4cf832f1ad163f5b25dd8a6f2d314c169c23c82f erroneously removed logging of open and close of netconf connections. This is now corrected.
2016-02-29Merge branch 'hans/ssh/maint_cuddle_tests' into maintHans Nilsson
2016-02-29public_key: An encapsulated PEM header shall be followed by a blank lineIngela Anderton Andin
RFC 1421 Privacy Enhancement for Electronic Mail February 1993 Encapsulated Message Pre-Encapsulation Boundary (Pre-EB) -----BEGIN PRIVACY-ENHANCED MESSAGE----- Encapsulated Header Portion (Contains encryption control fields inserted in plaintext. Examples include "DEK-Info:" and "Key-Info:". Note that, although these control fields have line-oriented representations similar to RFC 822 header fields, the set of fields valid in this context is disjoint from those used in RFC 822 processing.) Blank Line (Separates Encapsulated Header from subsequent Encapsulated Text Portion) Encapsulated Text Portion (Contains message data encoded as specified in Section 4.3.) Post-Encapsulation Boundary (Post-EB) -----END PRIVACY-ENHANCED MESSAGE-----
2016-02-29Merge branch 'siri/ct_netconfc/allow-ssh-options/OTP-13338' into maintSiri Hansen
* siri/ct_netconfc/allow-ssh-options/OTP-13338: Allow any ssh option when starting a netconf client
2016-02-29Merge branch 'siri/appups-18.3' into maintSiri Hansen
* siri/appups-18.3: Update appups in kernel, stdlib and sasl for OTP-18.3
2016-02-29wx: Add wxWindow:SetTransparent and CanSetTransperantDan Gudmundsson
Available in at least 2.8.12 and later.
2016-02-29wx: Add wxWindow SetDoubleBuffered and IsDoubleBuffered from wxWidgets 3.0Dan Gudmundsson
This is really needed on windows to get rid of flickering when updating some widgets. These functions are only available if 3.0 and not on mac where everything is double buffered already.
2016-02-29wx: Remove http_util usageDan Gudmundsson
Use erlang builtin list_to_integer instead
2016-02-29wx: Tiny optimizationDan Gudmundsson
Set context to avoid future lookups
2016-02-26Merge branch 'hans/eldap/prepare_release' into maintHans Nilsson
2016-02-26Merge branch 'hans/ssh/prepare_release' into maintHans Nilsson
2016-02-25Merge branch 'kenneth/ssh_erl-87/OTP-13305' into maintHans Nilsson
2016-02-25eldap: step vsn.mkHans Nilsson
2016-02-25eldap: fix error found by dialyzerHans Nilsson
2016-02-25ssh: Adjusted timetrap values on ssh testsHans Nilsson
2016-02-25ssh: add timetrap to ssh_sup_SUITEHans Nilsson
2016-02-25Merge branch 'egil/heart-callback/OTP-13250' into maintBjörn-Egil Dahlberg
2016-02-25kernel: Clarify heart optionBjörn-Egil Dahlberg
Change scheduler responsiveness to 'check_schedulers'.
2016-02-25Update appups in kernel, stdlib and sasl for OTP-18.3Siri Hansen
2016-02-25ssh: step vsn.mkHans Nilsson
2016-02-25Allow any ssh option when starting a netconf clientSiri Hansen
The netconf client in common_test was earlier very restrictive as to which ssh options the user could set. This is now changed, and any ssh option is now allowed. The netconf client will simply pass on any option, which it does not recognize, to ssh.
2016-02-25Merge branch 'legoscia/fix-ssl-example/PR-976/OTP-13363' into maintIngela Anderton Andin
* legoscia/fix-ssl-example/PR-976/OTP-13363: ssl: Modernize utility function Fix ssl example
2016-02-25Merge branch 'bernardd/gen_tcp_export_socket' into maintHenrik Nord
* bernardd/gen_tcp_export_socket: Export gen_tcp:socket() type OTP-13380
2016-02-25Merge branch 'kostis/hipe-icode-cleanup' into maintHenrik Nord
* kostis/hipe-icode-cleanup: Fix dialyzer warning and some code refactoring OTP-13379
2016-02-25Merge branch 'legoscia/crl-check-without-dp' into maintHenrik Nord
* legoscia/crl-check-without-dp: Be suspicious of certificates without CRL DPs Refactor ssl_crl_SUITE: extract crl_verify_error/6 OTP-13378
2016-02-25Merge branch 'legoscia/critical-extension-verify-none' into maintHenrik Nord
* legoscia/critical-extension-verify-none: ssl: with verify_none, accept critical extensions OTP-13377
2016-02-25Merge branch 'benwilson512/better-maps-with' into maintHenrik Nord
* benwilson512/better-maps-with: Improved maps:with/2 and maps:without/2 algorithm OTP-13376
2016-02-25Merge branch 'hans/eldap/unbind/OTP-13327' into maintHans Nilsson
Conflicts: lib/eldap/src/eldap.erl
2016-02-25Merge branch 'hans/eldap/referral/OTP-12272' into maintHans Nilsson
2016-02-24[erl_interface] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2016-02-23kernel: Remove calls to erl_exitSverker Eriksson
from debug and example code