aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-07Merge branch 'bjorn/asn1/fix-recursion-problem' into maintBjörn Gustavsson
* bjorn/asn1/fix-recursion-problem: asn1_SUITE_value: Don't test the LDAP module
2016-03-05Add missing internal hook functionsPeter Andersson
2016-03-04Fix remaining issuesPeter Andersson
2016-03-03Fix remaining issuesPeter Andersson
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-03Fix code_SUITE after test_server changeSiri Hansen
test_server:start_node does no longer add the test_server path to the new node, since the needed code is present in the default path. This caused two test cases in code_SUITE to fail. code_SUITE:mult_lib_roots: Expected the test_server path to be first in the code path. This check is removed. code_SUITE:bad_erl_libs: Started a node with "-env ERL_LIBS ", i.e. not giving any value to the ERL_LIBS variable. This test succeeded by accident, since the combination with arguments set by test_server_node.erl and by slave.erl caused the node start to work, and no further checks were present in the test. This part of the test case is now removed.
2016-03-03Set default value for crash_dump_dirSiri Hansen
test_server_sup:crash_dump_dir() is expected to return {ok,Dir}, but if there was no test framework set, then it would return just 'ok'. To avoid crash, the function will no returm {ok,Cwd} if no framework is set.
2016-03-02Merge branch 'ia/msantos/unsupported-protocols' into maintIngela Anderton Andin
* ia/msantos/unsupported-protocols: Skips any sockets with unsupported protocols.
2016-03-02Skips any sockets with unsupported protocols.Ingela Anderton Andin
Patch from end of PR 864 Fixes problem reported in the PR by jeckersb In this error case, a negative file descriptor is now saved at listensock[i], which leads to a buffer overflow later on at https://github.com/msantos/otp/blob/epmd-IPv6-node-reg2/erts/epmd/src/epmd_srv.c#L498 when calling FD_ISSET(listensock[i],&read_mask). To reproduce this: Completely disable IPv6 with ipv6.disable=1 on the kernel command line Build with fortified code (RHEL/CentOS default): CFLAGS='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -fno-strict-aliasing'
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-03-01Update ct_hooks test suitesPeter Andersson
2016-03-01Introduce new CT hook functionsPeter Andersson
2016-02-29Merge branch 'maint-r16' into maintSverker Eriksson
Fake merge. OTP-13384 was backported from OTP 18.
2016-02-29Enable execution of multiple test cases or groups from a test spec termPeter Andersson
2016-02-29Merge branch 'hans/ssh/maint_cuddle_tests' into maintHans Nilsson
2016-02-29vsn -> 1.11.2Anders Svensson
2016-02-29Update appup for 18.3Anders Svensson
OTP-13164 more efficient peer lookup OTP-13342 remote watchdog transition into state SUSPECT
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-26Prepare releaseerl_1271Erlang/OTP
2016-02-26Merge branch 'sverk/r16/crypto-EVP-aes_cbc/OTP-13384' into maint-r16Erlang/OTP
* sverk/r16/crypto-EVP-aes_cbc/OTP-13384: crypto: Fix undefined symbol EVP_CIPHER_CTX_new crypto: use EVP for AES-CBC
2016-02-26crypto: Fix undefined symbol EVP_CIPHER_CTX_newSverker Eriksson
Use a stack allocated context and EVP_CIPHER_CTX_init/cleanup instead of dynamic EVP_CIPHER_CTX_new/free that does not exist in older 0.9.8 versions. Cherry-pick from b23f1ff1f79
2016-02-26crypto: use EVP for AES-CBCAlex Wilson
This enables the use of hardware acceleration for AES crypto on newer Intel CPUs (AES-NI), among other platforms. Cherry-pick from 425a34001fdd
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