aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-03-08Merge branch 'sverk/Werror-implicit'Sverker Eriksson
* sverk/Werror-implicit: otp: Add gcc option -Werror=implicit
2016-03-08Merge branch 'maint'Sverker Eriksson
2016-03-08erts: Fix alloc_SUITE:rbtree and migration for win64Sverker Eriksson
One little (unsigned long) left behind.
2016-03-08Merge branch 'maint'Anders Svensson
2016-03-08Merge branch 'anders/diameter/18.3/OTP-13322' into maintAnders Svensson
* anders/diameter/18.3/OTP-13322: vsn -> 1.11.2 Update appup for 18.3
2016-03-08Merge branch 'maint'Peter Andersson
2016-03-08Merge branch 'peppe/common_test/cth_improvements' into maintPeter Andersson
* peppe/common_test/cth_improvements: Add missing internal hook functions Fix remaining issues Update ct_hooks test suites Introduce new CT hook functions OTP-13242
2016-03-08Merge branch 'peppe/common_test/rm_unwanted_tests' into maintPeter Andersson
* peppe/common_test/rm_unwanted_tests: Fix remaining issues Enable execution of multiple test cases or groups from a test spec term OTP-13241
2016-03-08Merge branch 'maint'Henrik Nord
2016-03-08Merge branch 'henrik/doc-fixes' into maintHenrik Nord
* henrik/doc-fixes: Fix typo in INSTALL.md Update README.md Fix typo in 'app' documentation s/is/are
2016-03-08Merge branch 'maint'Sverker Eriksson
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-08Merge branch 'dgud/test-cuddle' into maintDan Gudmundsson
* dgud/test-cuddle: Test windows registry in places we are allowed to write test: do not divide by zero
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-08test: do not divide by zeroDan Gudmundsson
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-07stdlib: Fix io_SUITE:bad_printable_range for windowsSverker Eriksson
avoid os:cmd as it treats stderr different on windows.
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-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-04Merge branch 'hb/doc/bitstring'Hans Bolinder
* hb/doc/bitstring: erts: Use 'bit string' in The Abstract Format document
2016-03-04erts: Use 'bit string' in The Abstract Format documentHans Bolinder
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-03Update primary bootstrapBjörn Gustavsson
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 'maint'Ingela Anderton Andin
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 '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