aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-02-21Merge branch 'hb/kernel/spec_bug_fix/OTP-11730'Hans Bolinder
* hb/kernel/spec_bug_fix/OTP-11730: Correct the contract of inet:ntoa/1
2014-02-21Merge branch 'hb/stdlib/epp_bug_fix/OTP-11728'Hans Bolinder
* hb/stdlib/epp_bug_fix/OTP-11728: Fix a bug in epp concerning circular macro definitions
2014-02-20Merge branch 'hans/ssh/patch_1261/rbs'Hans Nilsson
* hans/ssh/patch_1261/rbs: fix calculation of variable thanks to Alexander Demidenko ssh: The server ssh_cli does not delay tty_geometry requests in case no tty is allocated ssh: fix 'known_hosts' bug in ssh_file ssh: Changed order of decode clauses to temp fix decode error ssh: Fixes memory crash Fix that result on stderr sent back to ssh:exec had length info present
2014-02-20Merge branch 'sverk/on_load-warning'Sverker Eriksson
* sverk/on_load-warning: erts: Add more details to warning in on_load docs
2014-02-20erts: Add more details to warning in on_load docsSverker Eriksson
2014-02-20Merge branch 'siri/restart_app-type/OTP-11716'Siri Hansen
* siri/restart_app-type/OTP-11716: [sasl] Use restart type from .rel when restarting apps during upgrade
2014-02-20Merge branch 'siri/appup_tests_17/OTP-11534'Siri Hansen
* siri/appup_tests_17/OTP-11534: Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib Update appups and appup tests for kernel, stdlib and sasl
2014-02-20Correct the contract of inet:ntoa/1Hans Bolinder
Thanks to Max Treskin.
2014-02-20Fix a bug in epp concerning circular macro definitionsHans Bolinder
epp could loop when encountering a circular macro definition in an included file. Thanks to Maruthavanan Subbarayan for reporting the bug, and to Richard Carlsson for providing a bug fix.
2014-02-20Merge branch 'bjorn/cuddle-with-tests'Björn Gustavsson
* bjorn/cuddle-with-tests: With --enable-native-libs, skip eprof_SUITE:basic_option/1 Speed up bs_construct_SUITE:dynamic/1
2014-02-20With --enable-native-libs, skip eprof_SUITE:basic_option/1Björn Gustavsson
eprof does not work on native-compiled code. Since eprof_SUITE:basic_option/1 does profiling on the lists modules, the test case will fail if --enable-native-libs is used.
2014-02-20Speed up bs_construct_SUITE:dynamic/1Björn Gustavsson
The original test comes from the emulator test suite for testing binary syntax in the run-time system. Running interpreted it can be quite slow, especially when the system has been compiled with the configure option --enable-native-libs (probably because of very many context switches between native code and BEAM code). Speed up the test by scaling down the size of binaries from 128 bits to 64 bits. That should speed up the test roughly four times. By running the little and big endian tests in parallel we will cut that time in half. Thus all in all the test will run roughly 8 times faster.
2014-02-20Merge branch 'bjorn/asn1/cleanup/OTP-11727'Björn Gustavsson
* bjorn/asn1/cleanup/OTP-11727: asn1ct_check: Use a return value to silence a dialyzer warning asn1ct_check: Remove useless call to check_integer/3 asn1ct_check: Correct error handling for illegal OCTET STRING values asn1ct: Silence dialyzer warnings for unmatched returns asn1ct_table: Remove unused flexibility in table creation asn1ct_table: Silence a dialyzer warning for unmatched return asn1ct_gen: Silence dialyzer warnings for unmatched returns asn1ct_value: Silence a dialyzer warning for unmatched return asn1ct_tok: Check return value from file:close/1
2014-02-20Merge branch 'dgud/kernel/application-deadlock/OTP-11171'Dan Gudmundsson
* dgud/kernel/application-deadlock/OTP-11171: kernel: Fix an application terminate deadlock possibility
2014-02-20Merge branch 'dgud/runtime_tools/scheduler_wall_time_flags/OTP-11693'Dan Gudmundsson
* dgud/runtime_tools/scheduler_wall_time_flags/OTP-11693: runtime_tools: Do not turn off scheduler_wall_time
2014-02-20Merge branch 'fenollp/shell-expand-0arity-completely'Björn Gustavsson
* fenollp/shell-expand-0arity-completely: Correct parenthesis expansion Clean up edlin_expand_SUITE.erl to facilitate maintainance
2014-02-20Merge branch 'sverk/nif_SUITE-memleak'Sverker Eriksson
* sverk/nif_SUITE-memleak: erts: Fix memory leak in nif_SUITE:resource_takeover
2014-02-20erts: Fix memory leak in nif_SUITE:resource_takeoverSverker Eriksson
2014-02-20Merge branch 'lukas/tools/fix_maps_in_emacs_mode/OTP-11616'Lukas Larsson
* lukas/tools/fix_maps_in_emacs_mode/OTP-11616: tools: Update emacs mode with map highlights
2014-02-20Merge branch 'lukas/erts/dtrace-config-logging/OTP-11622'Lukas Larsson
* lukas/erts/dtrace-config-logging/OTP-11622: dtrace: Update dtrace docs with latest tested platforms erts: Fix dtrace generation on FreeBSD erts: Rewrite dtrace configure test
2014-02-19Merge branch 'sverk/ets-all-race'Sverker Eriksson
OTP-11726 * sverk/ets-all-race: erts: Fix faulty asserts in erts_sys_aligned_alloc/free erts: Fix harmless (?) typo in beam_load.c erts: Fix race bug in ets:all/0
2014-02-19erts: Fix faulty asserts in erts_sys_aligned_alloc/freeSverker Eriksson
2014-02-19erts: Fix harmless (?) typo in beam_load.cSverker Eriksson
2014-02-19erts: Fix race bug in ets:all/0Sverker Eriksson
causing recently created/deleted tables to not be included/excluded.
2014-02-19Merge branch 'sverk/test_server/openbsd-dynlink'Sverker Eriksson
* sverk/test_server/openbsd-dynlink: erts: Skip driver_SUITE:thr_free_drv for VM without threads erts: Fix driver_SUITE:otp_9302 for VM without threads test_server: Fix dynlib link command for openbsd
2014-02-19Merge branch 'sverk/crypto/nomem-abort'Sverker Eriksson
OTP-11725 * sverk/crypto/nomem-abort: crypto: Abort VM if out of memory
2014-02-19Merge branch 'sverk/crypto/hmac-context-reuse-bug'Sverker Eriksson
OTP-11722 OTP-11724 * sverk/crypto/hmac-context-reuse-bug: crypto: Fix bug when using old hmac context erts: Fix NIF bug when load/upgrade fails after enif_open_resource_type Conflicts: erts/emulator/test/nif_SUITE.erl
2014-02-19kernel: Fix an application terminate deadlock possibilityDan Gudmundsson
Could happen if get_child was called during terminate. io (since it is a group_leader) also causes problems after get_child was called. Split up and do it async.
2014-02-19Merge branch 'anders/diameter/sctp/OTP-11661'Anders Svensson
* anders/diameter/sctp/OTP-11661: Use inet:{peer,sock}names/1 in diameter_sctp
2014-02-19Use inet:{peer,sock}names/1 in diameter_sctpAnders Svensson
OTP-10229 (commit c4592b69) added these function to give access to all addresses on a multihomed endpoint, their singular siblings not returning anything useful in this case. This fixes {accept, Match} config, which matches peer addresses against configured addresses or regexps to decide whether or not a newly established association should be retained. The functionality was added in OTP-10893 (commit 9bbf27eb) but predated OTP-10229 by a few months. It also fixes the addresses shown for SCTP associations in diameter:service_info/2 output.
2014-02-19Update primary bootstrapBjörn Gustavsson
2014-02-19Merge branch 'nox/compiler/v3_core-comprehensions-cleanup'Björn Gustavsson
* nox/compiler/v3_core-comprehensions-cleanup: Simplify comprehension compilation in v3_core OTP-11720
2014-02-18[sasl] Use restart type from .rel when restarting apps during upgradeSiri Hansen
Earlier the 'restart_application' upgrade instruction always cause the application to be restarted as permanent. This could cause the system to end up in an unexpected state after an upgrade. This is now corrected.
2014-02-17Update sasl/test/test_lib.hrl with recent versions of kernel and stdlibSiri Hansen
2014-02-17Simplify comprehension compilation in v3_coreAnthony Ramine
Given that map comprehensions and generators and maybe && generators will be added to the language in the future, v3_core:lc_tq and v3_core:bc_tq could use a rewrite to avoid a complexity explosion, where there are as many related clauses as the product of the number of types of generators and the number of types of comprehensions. The new code abstract over all generators at the same time, there is only one clause for generators per type of comprehension, and all the filter code has been put in a common function filter_tq. It should also be noted that generator inputs are now compiled before the rest of the qualifiers, reversing names of nested comprehensions.
2014-02-17Merge branch 'bjorn/lc-warnings/OTP-11626'Björn Gustavsson
* bjorn/lc-warnings/OTP-11626: dialyzer: Silence useless warnings about list comprehensions
2014-02-17Correct parenthesis expansionBjörn Gustavsson
Commit dfb4ec804a099b539c91e5643090d8183885e71c attempted to add a closing parenthesis to the expansion of a funtion of zero arity if there were no other functions with the same name. Unfortunately it would add the closing parenthesis in many cases when there was another function with another name (e.g. to Mod:module_info/0 even though there is a Mod:module_info/1). Correct logic for adding parenthesis and add a test case.
2014-02-17Clean up edlin_expand_SUITE.erl to facilitate maintainanceBjörn Gustavsson
* Introduce the helper function do_expand/1. * Remove all ?line macros.
2014-02-17Merge branch 'peppe/common_test/parallel_tc_problem'Peter Andersson
* peppe/common_test/parallel_tc_problem: Fix problem with parallel test cases getting identical log file names OTP-11644
2014-02-17Merge branch 'peppe/common_test/ct_test_support_updates'Peter Andersson
* peppe/common_test/ct_test_support_updates: Fix problem with verification for parallel groups in ct_telnet_SUITE
2014-02-17Merge branch 'ia/ssl/cipher-version-mismatch/OTP-11712'Ingela Anderton Andin
* ia/ssl/cipher-version-mismatch/OTP-11712: ssl: Fix possible mismatch between SSL/TLS version and default ciphers ssl: Add test for avoiding a version and chipher suite missmatch
2014-02-17Merge branch 'siri/patch_app/OTP-11711'Siri Hansen
* siri/patch_app/OTP-11711: Add patch_app option to otp_build
2014-02-14Merge branch 'nox/maps-improve-erl_expand_records'Björn-Egil Dahlberg
* nox/maps-improve-erl_expand_records: Fix expansion of records in maps
2014-02-14ssl: Fix possible mismatch between SSL/TLS version and default ciphersIngela Anderton Andin
2014-02-14ssl: Add test for avoiding a version and chipher suite missmatchIngela Anderton Andin
2014-02-14Merge branch 'weisslj/ssh-spec-doc-fixes'Henrik Nord
* weisslj/ssh-spec-doc-fixes: ssh: Fix dialyzer type specs and documentation OTP-11705
2014-02-14Merge branch 'galaxie/supress-normal-terminates'Henrik Nord
* galaxie/supress-normal-terminates: Suppress error report when child was terminated normally OTP-11685
2014-02-14Suppress error report when child was terminated normallybell
Description: Let's assume we have a supervisor_bridge as a non-permanent child of a supervisor. When the bridge terminates normally it reports by error_logger:error_report, but the supervisor does nothing. So we have tons (especially, when it's simple_one_for_one) of error messages while everything is completely ok. Let's assume we have a supervisor_bridge as a permanent child of a supervisor. When the bridge terminates, it invokes error_logger, but what for? The supervisor will invoke error_logger about this error right after that. So what is the reason for the error_logger to log for normally terminating children in this case?
2014-02-14Merge branch 'vinoski/dialyzer-doc-fix'Henrik Nord
* vinoski/dialyzer-doc-fix: fix -Wno_behaviours doc error in dialyzer man page OTP-11706
2014-02-14Merge branch 'calebh/fix-regestry-type-annotation'Henrik Nord
* calebh/fix-regestry-type-annotation: Fix alternative registry type annotations in supervisor OTP-11707