aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-06-13Merge branch 'ia/ssl/dialyzer-specs' into maintIngela Anderton Andin
* ia/ssl/dialyzer-specs: ssl: Fix dialyzer specs to reflect reality
2014-06-12Merge branch 'sverk/etp-alloc-stats' into maintSverker Eriksson
* sverk/etp-alloc-stats: erts: Fix documentation for no of default allocator instances erts: Add etp-alloc-stats and etp-alloc-instances
2014-06-12erts: Fix documentation for no of default allocator instancesSverker Eriksson
ll_alloc does not default to single instance since 17.0
2014-06-12ssl: Fix dialyzer specs to reflect realityIngela Anderton Andin
2014-06-12Merge branch 'marcus/ssh-fix-spelling/OTP-11963' into maintMarcus Arendt
* marcus/ssh-fix-spelling/OTP-11963: Fix spelling mistakes
2014-06-12Fix spelling mistakesMarcus Arendt
2014-06-12Merge branch 'bmk/diameter/fix_appup' into maintMicael Karlberg
2014-06-12erts: Add etp-alloc-stats and etp-alloc-instancesSverker Eriksson
2014-06-12Merge branch 'bjorn/kernel/stick-preloaded/OTP-11913' into maintBjörn Gustavsson
* bjorn/kernel/stick-preloaded/OTP-11913: Allow unsticking pre-loaded modules
2014-06-12Allow unsticking pre-loaded modulesBjörn Gustavsson
Commit ed06dd12ea74018b902a2c4c7924313d23cedb75 made pre-loaded modules (such as erlang) sticky, and also made it impossible to unstick them to prevent them from ever be reloaded. It turns out that there are tools that may want to instrument the erlang module (such as concuerror), so making it impossible to unstick modules is harsh. Therefore, revert the part of the commit that prevented unsticking the pre-loaded modules.
2014-06-12Merge branch 'ia/ssh/inet-option/OTP-11976' into maintIngela Anderton Andin
* ia/ssh/inet-option/OTP-11976: ssh: Handle inet and inet6 option correctly
2014-06-12Merge branch 'ia/ssl/CSS/OTP-11975' into maintIngela Anderton Andin
* ia/ssl/CSS/OTP-11975: ssl: Make sure change cipher spec is correctly handled
2014-06-11ssh: Handle inet and inet6 option correctlyIngela Anderton Andin
2014-06-11Merge branch 'siri/ct-and-cover/OTP-11971' into maintSiri Hansen
* siri/ct-and-cover/OTP-11971: Improve cover analysis via common_test Change internal format of CoverInfo in test_server [ct] Add test of cover support when merge_tests=false
2014-06-11Corrected module name in appup fileMicael Karlberg
2014-06-11Merge branch 'ia/ssl/version-argument' into maintIngela Anderton Andin
* ia/ssl/version-argument: ssl: Version argument to ssl_cipher:anonymous_suites should not be added yet!
2014-06-11ssl: Make sure change cipher spec is correctly handledIngela Anderton Andin
2014-06-11Merge remote-tracking branch 'erlang/pr/383' into maintHenrik Nord
* erlang/pr/383: Fix small copy&paste mistakes in doc of alternative process registry
2014-06-11Merge branch 'matwey/arm' into maintHenrik Nord
* matwey/arm: Add correct detection of powerpc architecture. Add correct detection of armv6hl and armv7hl architectures.
2014-06-11Merge branch 'nox/fix-perms' into maintHenrik Nord
* nox/fix-perms: Fix permissions of some files in the repository
2014-06-11Merge branch 'qrilka/ssl-seconds-in-24h' into maintHenrik Nord
* qrilka/ssl-seconds-in-24h: ssl: Fix incorrect number of seconds in 24 hours
2014-06-11Merge branch 'telsacolton/snmp_test_manager_badmatch_pid' into maintHenrik Nord
* telsacolton/snmp_test_manager_badmatch_pid: Fix badmatch error when trying to start_link an snmp_test_manager Edit line 59 to remove "mgr" key from #State record. Edit line 133 to expect ok instead of {ok, Pid} from snmpm:start_link . Edit line 136 not to reference Pid variable which was removed above.
2014-06-11Merge branch 'pguyot/fix_srp' into maintHenrik Nord
* pguyot/fix_srp: Fix bug in SRP implementation
2014-06-06Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green
* jjhoo/mingw_compile_fix_forceinline/OTP-11945: Do not use __always_inline__ attribute unless gcc vsn >= 3.1.1 Add ETHR_FORCE_INLINE define to hide compiler specific directives
2014-06-06Merge branch 'rickard/invalid_bitstr_bifs/OTP-11942' into maintRickard Green
* rickard/invalid_bitstr_bifs/OTP-11942: Remove invalid 'bitstr' exports in erlang.erl
2014-06-06Merge branch 'rickard/binary_to_term_error/OTP-11931' into maintRickard Green
* rickard/binary_to_term_error/OTP-11931: Replace erlang:binary_to_term() Erlang wrappers Conflicts: erts/preloaded/ebin/erts_internal.beam
2014-06-06Merge branch 'rickard/yielding-binary-list-conversions/OTP-11888' into maintRickard Green
* rickard/yielding-binary-list-conversions/OTP-11888: Add test-case comparing old and new implementations Make binary BIFs converting from lists yield on large input Make binary BIFs converting to lists yield on large input
2014-06-06Merge branch 'rickard/disable-gc-fix/OTP-11887' into maintRickard Green
* rickard/disable-gc-fix/OTP-11887: Do not GC other processes in non-smp runtime Fix conversion of empty string in erts_convert_native_to_filename() Add support for failing in BIF that has trapped HiPE wrappers for BIFs disabling GC
2014-06-05Remove invalid 'bitstr' exports in erlang.erlRickard Green
The dummy BIF exports 'erlang:bitstr_to_list/1' and 'erlang:list_to_bitstr/1' seem to have appeared as a result of a copy-paste error and are now removed.
2014-06-05Replace erlang:binary_to_term() Erlang wrappersRickard Green
Replace the 'erlang:binary_to_term/1' and 'erlang:binary_to_term/2' Erlang wrappers taking care of failure after yield with management of this in the hidden yield BIF.
2014-06-05Improve cover analysis via common_testSiri Hansen
This addresses several bugs in common_test (ct) when using the cover analysis mechanism: In a ct test run, one can give a cover spec file which indicates that cover analysis shall be run, including a number of modules and a number of nodes. During the ct test run, multiple jobs may be started in test_server, and when the cover option is used, test_server would cover compile and analyse all given modules for each job. This commit instead allows the compilation and analysis to be explicitly ordered by ct for each test run. This way each module will only be cover compiled and analysed once. The cover log will be located in the common_test log directory (ct_run.<timestamp>), and the "Coverage log" link in each suite.log.html will point to this file. A new button is also added in the top level ct index file, which points to the cover log. This change also reduces the need of using the 'export' and 'import' options, since there is no longer any need to accumulate cover data over multiple test_server jobs. However, these options may still be used for importing and exporting cover data in order to store or accumulate data from multiple ct test runs. The 'nodes' option was earlier only used by ct to start cover on the given nodes before starting the first test_server job. After this job was completed, test_server would stop cover completely and then start it again for the next job without any knowledge of the 'nodes' options. For the next test_server jobs cover would therefore no longer be running on these nodes. Explcit calls to ct_cover:add_nodes had to be done in order to collect data through all test_server jobs. This bug has now been solved, since cover is no longer stopped between each test_server job. Finally, ct no longer stores cover data using ct_util:set_testdata. This was earlier used by ct_cover:add_nodes to make sure no node was added twice.This did, however, cause some problems when ct and cover were out of sync. ct could belive that a node was running cover and thus reject adding this node, while in reality cover had been stopped on the node (e.g. by test_server) so no cover data was collected. ct_cover:add_nodes will now instead use cover:which_nodes to check if a node is already running.
2014-06-05Merge branch 'bjorn/kernel/stick-preloaded/OTP-11913' into maintBjörn Gustavsson
* bjorn/kernel/stick-preloaded/OTP-11913: Make pre-loaded modules permanently sticky application_SUITE: Clean up the code after the test is done Teach code:del_path/1 to ignore superfluous slashes
2014-06-05ssl: Version argument to ssl_cipher:anonymous_suites should not be added yet!Ingela Anderton Andin
2014-06-05Merge branch 'etsukata/system_info_tolerant_timeofday/OTP-11970' into maintLukas Larsson
* etsukata/system_info_tolerant_timeofday/OTP-11970: Add erlang:system_info(tolerant_timeofday)
2014-06-05Merge branch 'ia/ssl/dumb-clients/OTP-11969' into maintIngela Anderton Andin
* ia/ssl/dumb-clients/OTP-11969: ssl: Avoid creating a huge session table
2014-06-05Merge branch 'lukas/erts/fix_trace_on_registered_procs/OTP-11968' into maintLukas Larsson
* lukas/erts/fix_trace_on_registered_procs/OTP-11968: erts: tracing on send now works for registered processes
2014-06-05erts: tracing on send now works for registered processesLukas Larsson
This bug was introduced in R16B. Testcases have been adapted to verify the correct behaviour.
2014-06-04Make pre-loaded modules permanently stickyBjörn Gustavsson
Modules in the kernel, stdlib, and compiler applications are by default "sticky", meaning that the code server will refuse to re-load them. The pre-loaded modules (those that are part of the run-time system itself, such as 'erlang') are, however, not sticky. They used to be sticky a long time ago when the pre-loaded modules were part of the kernel application. Now they are part of the erts application. Since re-loading a pre-loaded module can be catastrophic (especially re-loading the 'erlang' module), the pre-loaded modules must be sticky. Furthermore, it should not be allowed to unstick them. The sticky_dir/1 test case in code_SUITE is never actually run and is broken. Rewrite it.
2014-06-04Merge branch 'sverk/crypto-leaking-hmac/OTP-11953' into maintSverker Eriksson
* sverk/crypto-leaking-hmac/OTP-11953: crypto: Fix memory leak in some error cases crypto: Fix memory leak in hmac stream functions
2014-06-04Merge branch 'scrapinghub/stream_body_with_no_content_length' into maintMarcus Arendt
* scrapinghub/stream_body_with_no_content_length: inets: Fix HTTP 1.0 body end on closed connection
2014-06-04Merge branch 'mikpe/openfile-dont-use-undefined-statbuf' into maintMarcus Arendt
* mikpe/openfile-dont-use-undefined-statbuf: Fix efile_openfile() to handle stat() failure
2014-06-04Merge branch 'RoadRunnr/ssl/fix-tests' into maintMarcus Arendt
* RoadRunnr/ssl/fix-tests: SSL: fix OpenSSL known renegotiation bug detection SSL: in tests, filter ssl client ciphers for version compatibility
2014-06-04Merge branch 'fenek/fix/vstudio_macro' into maintMarcus Arendt
* fenek/fix/vstudio_macro: Add Visual Studio macros to erl_driver.h and ei.h
2014-06-04Merge branch 'ia/ssl/default-ciphers/OTP-11966' into maintIngela Anderton Andin
* ia/ssl/default-ciphers/OTP-11966: ssl: Workaround that gen_fsm does not call CB:format_status when CB:terminate crashes. SSL: always filter the full list of supported ciphers against the supported algorithms ssl: Filter default ciphers for supported Crypto algorihms
2014-06-03ssl: Workaround that gen_fsm does not call CB:format_status when CB:terminateIngela Anderton Andin
crashes.
2014-06-03Merge branch 'lukas/erts/git_vsn_script_fix/OTP-11961' into maintLukas Larsson
* lukas/erts/git_vsn_script_fix/OTP-11961: erts: Fix git version script
2014-06-03erts: Fix git version scriptLukas Larsson
2014-06-03SSL: always filter the full list of supported ciphers against the supported ↵Andreas Schultz
algorithms With the addition of more ciphers that are not supported in all configurations, using a manually prefiltered cipher list (e.g. EC vs. non-EC ciphers) becomes to complex. Replace the manual split with ssl_cipher:filter_suites/1 in all places. Conflicts: lib/ssl/src/ssl.erl lib/ssl/src/tls_v1.erl
2014-06-03Merge branch 'ia/ssl/prep-release' into maintIngela Anderton Andin
* ia/ssl/prep-release: ssl: Prepare for release
2014-06-03Merge branch 'hb/dialyzer/correct_docs' into maintHans Bolinder
* hb/dialyzer/correct_docs: [dialyzer] Correct docs about options