aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-12-19Merge branch 'maint'Rickard Green
* maint: Remove faulty release note for these fixes New test cases testing stacktrace from apply on erlang:error() Fix stactrace for apply on error/[1,2], exit/1, or throw/1 Fix stack-trace generated by a traced process Conflicts: erts/emulator/beam/beam_emu.c erts/etc/unix/etp-commands.in
2016-12-19Merge branch 'rickard/stacktrace-bugs' into maintRickard Green
OTP-14055 * rickard/stacktrace-bugs: Remove faulty release note for these fixes New test cases testing stacktrace from apply on erlang:error() Fix stactrace for apply on error/[1,2], exit/1, or throw/1 Fix stack-trace generated by a traced process
2016-12-19Remove faulty release note for these fixesRickard Green
2016-12-19New test cases testing stacktrace from apply on erlang:error()Rickard Green
2016-12-19Fix stactrace for apply on error/[1,2], exit/1, or throw/1Rickard Green
2016-12-19Fix stack-trace generated by a traced processRickard Green
2016-12-19Merge pull request #1288 from bjorng/bjorn/compiler/use-less-memoryBjörn Gustavsson
Reduce memory consumption during compilation
2016-12-19Merge pull request #1290 from bjorng/bjorn/stdlib/takeBjörn Gustavsson
Add take/2 to all dictionary modules OTP-14102
2016-12-19Add take/2 to all dictionary modulesBjörn Gustavsson
Similar to maps:take/2, add take/2 to the other dictionary modules in STDLIB: orddict:take(Key, Dict) -> {Val,NewDict} | 'error'. dict:take(Key, Dict) -> {Val,NewDict} | 'error'. gb_trees:take(Key, Dict) -> {Val,NewDict}. For gb_trees also add: gb_trees:take_any(Key, Dict) -> {Val,NewDict} | 'error'. gb_trees already has delete() and delete_any(), so we will follow that design pattern. Suggested by Boris Bochkaryov in https://github.com/erlang/otp/pull/1209.
2016-12-19Merge branch 'maint'Ingela Anderton Andin
2016-12-19Merge branch 'ingela/ssl/terminate/OTP-14100' into maintIngela Anderton Andin
* ingela/ssl/terminate/OTP-14100: ssl: Correct terminate behaviour
2016-12-19ssl: Correct terminate behaviourIngela Anderton Andin
When the terminate function is called explicitly, to make guarantees that for instance the reuseaddr option works as expected, we must make sure that the clean up code is not run again when gen_statem calls terminate. This check was broken in the rewrite from gen_fsm to gen_statem. Caused PEM cache errors, that in some cases would cause unexpected connection failures.
2016-12-16Merge branch 'maint'Sverker Eriksson
2016-12-16Merge branch 'sverker/cuddle-code_SUITE-versions' into maintSverker Eriksson
* sverker/cuddle-code_SUITE-versions: erts: Fix hanging race in code_SUITE:versions
2016-12-16Merge branch 'maint'Sverker Eriksson
2016-12-16Merge pull request #1270 from kostis/hipe-testSverker Eriksson
hipe: one more test file and some cleanups
2016-12-16Merge branch 'maint'Björn Gustavsson
* maint: Allow escripts with only two lines Add project-wide Emacs settings file
2016-12-16Merge pull request #1279 from legoscia/emacs-dir-localsBjörn Gustavsson
Add project-wide Emacs settings file
2016-12-16Merge pull request #1275 from pjhades/fix/escriptBjörn Gustavsson
Allow escripts with only two lines OTP-14098
2016-12-16Merge branch 'maint'Hans Nilsson
2016-12-16Merge branch 'hans/eldap/cover_spec' into maintHans Nilsson
2016-12-16Merge branch 'maint'Ingela Anderton Andin
2016-12-16Merge branch 'ingela/inets/httpc-redirect-host-header/ERL-316/OTP-14097' ↵Ingela Anderton Andin
into maint * ingela/inets/httpc-redirect-host-header/ERL-316/OTP-14097: inets: httpc - Correct redirection host header
2016-12-16Merge branch 'maint'Ingela Anderton Andin
2016-12-16Merge branch 'ingela/inets/httpc-PATCH-doc' into maintIngela Anderton Andin
* ingela/inets/httpc-PATCH-doc: inets: httpc - patch method missing in doc
2016-12-15Merge branch 'maint'Hans Nilsson
2016-12-15Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2016-12-15eldap: add cover spec for nightly testsHans Nilsson
2016-12-15compile: Reduce memory consumption during compilationBjörn Gustavsson
The compiler would keep the data structures for two compiler passes in memory. That could increase the maximum amount of memory that the compiler uses, and could also have a negative impact on performance (terms that would not be used again would be copied by a garbage collection). Here is an example that shows how the previous version of the code could get captured: a_compiler_pass(Mod, St) -> case Mod:module(St#compile.code, St#compile.options) of {ok,Code} -> {ok,St#compile{code=Code}}; ... The reference to the code from the previous pass will only be released when St is updated. We can avoid the problem by passing the current version of the code as a function argument: a_compiler_pass(Mod, Code0, St) -> case Mod:module(Code0, St#compile.options) of {ok,Code} -> {ok,Code,St}; ... In practice, this change does not seem to significantly speed up the compiler, but it does not do any harm either. It should help dialyzer in situations when dialyzer compiles several large modules at the same time.
2016-12-15Merge branch 'maint'Björn-Egil Dahlberg
2016-12-15Merge branch 'egil/erts/handle-sigterm-nicely/OTP-14085' into maintBjörn-Egil Dahlberg
* egil/erts/handle-sigterm-nicely/OTP-14085: erts: Document SIGTERM handler erts: Add SIGTERM signal handler
2016-12-15erts: Document SIGTERM handlerBjörn-Egil Dahlberg
2016-12-15Merge branch 'maint'Björn-Egil Dahlberg
2016-12-15Merge branch 'egil/doc-maps-type/ERL-197/OTP-14096' into maintBjörn-Egil Dahlberg
* egil/doc-maps-type/ERL-197/OTP-14096: doc: Enchance map pair optional/mandatory notes doc: Change "stands for" to "denotes" in typespec Remove whitespace errors
2016-12-15Merge branch 'maint'Björn Gustavsson
* maint: Create CONTRIBUTING.md (#1278) Make sure that Travis fails when test cases fail Don't include problematic test cases in smoke test
2016-12-15Create CONTRIBUTING.md (#1278)Björn Gustavsson
According to https://help.github.com/articles/setting-guidelines-for-repository-contributors, a link to a file named CONTRIBUTING.md will be shown when someone is about to create a pull request. That is more visible than our Wiki pages, which are easy to miss. Create the CONTRIBUTING.md file, based on the existing Wiki page https://github.com/erlang/otp/wiki/Contribution-Guidelines.
2016-12-15Merge pull request #1277 from bjorng/bjorn/travis-run-testsBjörn Gustavsson
Make sure that Travis fails when test cases fail
2016-12-14inets: httpc - Correct redirection host headerIngela Anderton Andin
RFC2616 Sect 14.23: The Host request-header field specifies the Internet host AND port number.
2016-12-14ssh: [test] property test cuddlingHans Nilsson
2016-12-14ssh: [test] remove 'known_hosts' interference in test suiteHans Nilsson
2016-12-14ssh: [test] Move fn random_chars/1 to ssh_test_libHans Nilsson
2016-12-14ssh: [test] Put tstflg values in a proplistHans Nilsson
2016-12-14ssh: [test] Extend timetrap in test caseHans Nilsson
2016-12-14Merge tag 'OTP-19.2'Dan Gudmundsson
=== OTP-19.2 === Changed Applications: - common_test-1.13 - compiler-7.0.3 - crypto-3.7.2 - dialyzer-3.0.3 - edoc-0.8.1 - erl_docgen-0.6.1 - erl_interface-3.9.2 - erts-8.2 - eunit-2.3.2 - hipe-3.15.3 - inets-6.3.4 - kernel-5.1.1 - mnesia-4.14.2 - observer-2.3 - odbc-2.12 - parsetools-2.1.4 - public_key-1.3 - runtime_tools-1.11 - sasl-3.0.2 - ssh-4.4 - ssl-8.1 - stdlib-3.2 - syntax_tools-2.1.1 - tools-2.9 - wx-1.8 Unchanged Applications: - asn1-4.0.4 - cosEvent-2.2.1 - cosEventDomain-1.2.1 - cosFileTransfer-1.2.1 - cosNotification-1.2.2 - cosProperty-1.2.1 - cosTime-1.2.2 - cosTransactions-1.3.2 - debugger-4.2.1 - diameter-1.12.1 - eldap-1.2.2 - et-1.6 - gs-1.6.2 - ic-4.4.2 - jinterface-1.7.1 - megaco-3.18.1 - orber-3.8.2 - os_mon-2.4.1 - otp_mibs-1.1.1 - percept-0.9 - reltool-0.7.2 - snmp-5.2.4 - typer-0.9.11 - xmerl-1.3.12 * tag 'OTP-19.2': Updated OTP version Prepare release Conflicts: OTP_VERSION
2016-12-13Allow escripts with only two linesJing Peng
The current implementation assumes that escripts all have at least three lines. But according to the escript documentation, comments on the second line and emulator flags on the third line are all optional. Thus escripts with only two lines -- shebang on the first line and code on the second line -- will not run. This commit fixes the problem by rearranging the escript header parsing logic, and recognize the escript body on the second line if the header only contains a line of shebang.
2016-12-13inets: httpc - patch method missing in docIngela Anderton Andin
2016-12-13Add project-wide Emacs settings fileMagnus Henoch
Add a .dir-locals.el file, which applies indentation-related settings when editing any file in the project with Emacs.
2016-12-12doc: Enchance map pair optional/mandatory notesBjörn-Egil Dahlberg
2016-12-12doc: Change "stands for" to "denotes" in typespecBjörn-Egil Dahlberg
2016-12-12Remove whitespace errorsBjörn-Egil Dahlberg