aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2016-03-07Merge branch 'maint'Anders Svensson
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-07Merge branch 'maint'Raimo Niskanen
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 'maint'Björn Gustavsson
* maint: asn1_SUITE_value: Don't test the LDAP module
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-03Merge branch 'bjorn/compiler/binary-comprehensions/OTP-13289'Björn Gustavsson
* bjorn/compiler/binary-comprehensions/OTP-13289: Generalize bit string comprehensions
2016-03-02Merge branch 'bjorn/remove-test_server/OTP-12705'Björn Gustavsson
* bjorn/remove-test_server/OTP-12705: Remove multiple inclusion of ct.hrl otp_SUITE: Remove handling of test_server application Correct common_test.app.src
2016-03-02Merge branch 'egil/basedir-directories/OTP-13392'Björn-Egil Dahlberg
* egil/basedir-directories/OTP-13392: stdlib: Add filename:basedir/2,3 stdlib: Use parallel groups in filename_SUITE stdlib: Remove ?line macros in filename_SUITE
2016-03-02Merge branch 'maint'Henrik Nord
2016-03-02stdlib: Add filename:basedir/2,3Björn-Egil Dahlberg
2016-03-02stdlib: Use parallel groups in filename_SUITEBjörn-Egil Dahlberg
2016-03-02stdlib: Remove ?line macros in filename_SUITEBjörn-Egil Dahlberg
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 'maint'Ingela Anderton Andin
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 'maint'Siri Hansen
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 'siri/appups-19.0'Siri Hansen
* siri/appups-19.0: Update appups in kernel, stdlib and sasl for OTP-19
2016-03-02Merge branch 'maint'Ingela Anderton Andin
2016-03-02Merge branch 'siri/ct_release_test/remove-test_server'Siri Hansen
* siri/ct_release_test/remove-test_server: Remove application test_server from ct_release_test
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 'maint'Siri Hansen
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-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-01Remove application test_server from ct_release_testSiri Hansen
Since test_server is no longer an own application, it shall not be added to the releases create by ct_release_test.
2016-03-01Merge branch 'sverk/master/halt-INT_MIN'Sverker Eriksson
* sverk/master/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 '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 'maint'Ingela Anderton Andin
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-01Generalize bit string comprehensionsBjörn Gustavsson
The expression in a bit string comprehension is limited to a literal bit string expression. That is, the following code is legal: << <<X>> || X <- List >> but not this code: << foo(X) || X <- List >> The limitation is annoying. For one thing, tools that transform the abstract format must be careful not to produce code such as: << begin %% Some instrumentation code. <<X>> end || X <- List >> One reason for the limitation could be that we'll get reduce/reduce conflicts if we try to allow an arbitrary expression in a bit string comprehension: binary_comprehension -> '<<' expr '||' lc_exprs '>>' : {bc,?anno('$1'),'$2','$4'}. Unfortunately, there does not seem to be an easy way to work around that problem. The best we can do is to allow 'expr_max' expressions (as in the binary syntax): binary_comprehension -> '<<' expr_max '||' lc_exprs '>>' : {bc,?anno('$1'),'$2','$4'}. That will work, but functions calls must be enclosed in parentheses: << (foo(X)) || X <- List >>
2016-03-01Update appups in kernel, stdlib and sasl for OTP-19Siri Hansen
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 'maint'Hans Nilsson
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 'maint'Siri Hansen
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 'maint'Siri Hansen
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-26Merge branch 'bjorn/compiler/modernize-tests'Björn Gustavsson
* bjorn/compiler/modernize-tests: Remove ?line macros Replace use of lists:keysearch/3 with lists:keyfind/3 Eliminate use of doc and suite clauses Replace ?t with test_server Replace use of test_server:format/2 with io:format/2 Eliminate use of test_server:fail/0,1 Eliminate use of ?config() macro Modernize use of timetraps Eliminate useless helper functions
2016-02-26Merge branch 'josevalim/debugger-path/OTP-13375'Björn Gustavsson
* josevalim/debugger-path/OTP-13375: Use compile source info in debugger
2016-02-26Merge branch 'bjorn/compiler/bit-syntax/OTP-13374'Björn Gustavsson
* bjorn/compiler/bit-syntax/OTP-13374: Produce warnings for binary patterns that will never match v3_core: Include line number annotations in binary patterns sys_core_fold: Introduce var_list/2 sys_core_fold: Optimize clause/4
2016-02-26Merge branch 'bjorn/multiple-load/OTP-13111'Björn Gustavsson
* bjorn/multiple-load/OTP-13111: code: Add functions that can load multiple modules Refactor post_beam_load handling Simplify and robustify code_server:all_loaded/1 Update preloaded modules Add erl_prim_loader:get_modules/3 Add has_prepared_code_on_load/1 BIF Allow erlang:finish_loading/1 to load more than one module beam_load.c: Add a function to check for an on_load function
2016-02-26Merge branch 'maint'Hans Nilsson
2016-02-26Merge branch 'hans/eldap/prepare_release' into maintHans Nilsson
2016-02-26Merge branch 'hans/ssh/prepare_release' into maintHans Nilsson
2016-02-26Remove multiple inclusion of ct.hrlBjörn Gustavsson