aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-10-16Merge branch 'maint'Sverker Eriksson
2013-10-16Merge branch 'sverk/time-consistency-test' into maintSverker Eriksson
* sverk/time-consistency-test: erts: Fix time_SUITE:consistency to work over turn of the month
2013-10-15Merge branch 'maint'Sverker Eriksson
Conflicts: erts/preloaded/ebin/erlang.beam
2013-10-15Merge branch 'rickard-sverker/supercarrier/OTP-11149' into maintSverker Eriksson
* rickard-sverker/supercarrier/OTP-11149: (29 commits) erts: Add test case for erts_mmap erts: Add mutex to init_atoms in erts_mmap.c erts: Fix lock violation for init_atoms in erl_mmap.c erts: Fix misc minor bugs in supercarrier initialization erts: Add erts_mmap stats erts: Add erts_bld_tupleX macros erts: Rename erts_bld_atom_uint_2tup_list to *_uword_* erts: Fix bug in lookup_free_seg erts: Fix race bug in erts_munmap erts: Add HARD_DBG_MSEG erts: Refactor rbt_insert in erl_mmap erts: erts_mmap improved free seg desc management erts: Add documentation for +MMsc* system flags erts: Allow page aligned erts_munmap() erts: Sort tree in super aligned sizes (SA_SZ_ADDR_ORDER) erts: Fix ASSERT bug and void* arithmetics erts: Add mmap argument to erts_debug:get_internal_state erts: Improve erts_mmap out of free descriptor management erts: Cleanup erl_mmap erts: Add __func__ to ERTS_ASSERT macro ...
2013-10-15Merge branch 'maint'Fredrik Gustafsson
2013-10-15Merge branch 'blt/gen_server-typo/OTP-11398' into maintFredrik Gustafsson
* blt/gen_server-typo/OTP-11398: Change 'recive' to 'receive' in gen_server.erl
2013-10-14Merge branch 'maint'Fredrik Gustafsson
2013-10-14Merge branch 'fenollp/treewide_remove_unexpected_0xff/OTP-11323' into maintFredrik Gustafsson
* fenollp/treewide_remove_unexpected_0xff/OTP-11323: Remove ^L characters hidden randomly in the code. Not those used in text files as delimiters.
2013-10-14Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-10-14Merge branch 'ia/inets/http-client-cancel-request/OTP-11312' into maintIngela Anderton Andin
* ia/inets/http-client-cancel-request/OTP-11312: inets: httpc - Remove dead error handling code inets: httpc make httpc_cancel_request/[1,2] asynchronous httpc: Enhanched error handling inets: httpc improve pipelining
2013-10-14Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-10-14Merge branch 'ia/ssl/ecc-gnutls/OTP-11370' into maintIngela Anderton Andin
* ia/ssl/ecc-gnutls/OTP-11370: ssl: Fix dialyzer spec ssl: Honor TLS client ECC extension
2013-10-14ssl: Fix dialyzer specIngela Anderton Andin
2013-10-14Merge branch 'maint'Peter Andersson
2013-10-14Merge remote branch 'origin/peppe/common_test/missing_error_reports' into maintPeter Andersson
* origin/peppe/common_test/missing_error_reports: Use normal- instead of scaled timeouts in test case
2013-10-14Merge branch 'maint'Fredrik Gustafsson
2013-10-14Merge branch 'kostis/dialyzer_R16B02_fixes/OTP-11374' into maintFredrik Gustafsson
* kostis/dialyzer_R16B02_fixes/OTP-11374: Fix crash when using remote types in the tail of list types Adopt a convention about unknown modules No reason for calls to unknown modules Use the modern version of is_subtype Adopt a convention about unknown modules Fix a comment Add some more comments about what the test does
2013-10-14ssl: Honor TLS client ECC extensionIngela Anderton Andin
Also the server should only send ECC point formats extension not ECC curve extension.
2013-10-12Change 'recive' to 'receive' in gen_server.erlBrian L. Troutwine
A small spelling correction merely; no functionality change.
2013-10-11Merge branch 'maint'Björn Gustavsson
* maint: Documentation of tracer/2: Use the correct option name 'overload_check'
2013-10-11Merge branch 'bjorn/observer/fix-doc-bug/OTP-11335' into maintBjörn Gustavsson
* bjorn/observer/fix-doc-bug/OTP-11335: Documentation of tracer/2: Use the correct option name 'overload_check'
2013-10-11Merge branch 'maint'Fredrik Gustafsson
2013-10-11Merge branch 'ali/fix-inet-typespec/OTP-11377' into maintFredrik Gustafsson
* ali/fix-inet-typespec/OTP-11377: Fix the typespec for the inet:ifget/2 and inet:ifget/3 return value
2013-10-11Merge branch 'maint'Fredrik Gustafsson
2013-10-11Merge branch 'larshesel/fix-bsr-bug/OTP-11381' into maintFredrik Gustafsson
* larshesel/fix-bsr-bug/OTP-11381: Fix bsr bug Add bsr test data showing bug when shifting large numbers
2013-10-10Use normal- instead of scaled timeouts in test casePeter Andersson
2013-10-10Merge branch 'maint'Fredrik Gustafsson
2013-10-10Merge branch 'fredrik/public_key/convert_to_utf8' into maintFredrik Gustafsson
* fredrik/public_key/convert_to_utf8: public_key: change encoding to utf8
2013-10-10public_key: change encoding to utf8Fredrik Gustafsson
2013-10-10Merge branch 'maint'Fredrik Gustafsson
2013-10-10Merge branch 'weisslj/fix-httpd-timeout-options/OTP-11276' into maintFredrik Gustafsson
* weisslj/fix-httpd-timeout-options/OTP-11276: inets: added testcase for keep_alive_timeout Add test for httpd config option 'script_timeout' Fix httpd config option 'script_timeout' Fix httpd config option 'keep_alive_timeout'
2013-10-10Fix bsr bugLars Hesel Christensen
Fix bsr bug occurring when shifting a huge number a huge number of bits to the right. The bug can occur if Sint is 64 bits and int is 32 bits, causing a truncation in the big.c:I_lshift function.
2013-10-10Add bsr test data showing bug when shifting large numbersLars Hesel Christensen
Add test data demonstrating that bsr is broken when shifting a large number a huge number of bits to the right.
2013-10-10Merge branch 'maint'Fredrik Gustafsson
2013-10-10Merge branch 'ztmr/fix_public_key_doc/OTP-11380' into maintFredrik Gustafsson
* ztmr/fix_public_key_doc/OTP-11380: fix a little typo in public_key documentation
2013-10-10fix a little typo in public_key documentationTomas Morstein
In the example of `public_key:pem_entry_encode/2`, the result should match to `PemEntry` rather than to `PemBin` since `PemEntry` is expected as an input argument of `public_key:pem_encode/1` called just on the next line of the example.
2013-10-10Fix the typespec for the inet:ifget/2 and inet:ifget/3 return valueAli Sabil
2013-10-10Documentation of tracer/2: Use the correct option name 'overload_check'Björn Gustavsson
The implementation and the documentation disagreed on the name of option.
2013-10-09Fix crash when using remote types in the tail of list typesKostis Sagonas
Hans Bolider reported a dialyzer crash when using a remote type in the tail position of a maybe_improper_list() declaration. A test was created (by extending an existing module of the testsuite) and erl_types was modified to expand the remote type and not pass it unexpanded to subsequent phases in the processing.
2013-10-09Adopt a convention about unknown modulesKostis Sagonas
2013-10-09No reason for calls to unknown modulesKostis Sagonas
2013-10-09Use the modern version of is_subtypeKostis Sagonas
2013-10-09Adopt a convention about unknown modulesKostis Sagonas
2013-10-09Fix a commentKostis Sagonas
2013-10-09Add some more comments about what the test doesKostis Sagonas
This changed the lines so the results now differ.
2013-10-09Merge branch 'maint'Fredrik Gustafsson
2013-10-09Merge branch 'fredrik/eldap/do_connect_ssl_verify/OTP-11354' into maintFredrik Gustafsson
* fredrik/eldap/do_connect_ssl_verify/OTP-11354: eldap: eldap does not support peer verification, removed {verify, 0} from ssl options
2013-10-09Merge branch 'maint'Fredrik Gustafsson
2013-10-09Merge branch 'mururu/fix-eunit-io_request/OTP-11373' into maintFredrik Gustafsson
* mururu/fix-eunit-io_request/OTP-11373: Fix I/O-protocol error handling in eunit
2013-10-09Merge branch 'maint'Fredrik Gustafsson