aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-06-17doc: Fix broken linksBjörn-Egil Dahlberg
2014-06-17Merge branch 'ia/ssl/revert-due-to-performance-issue' into maintIngela Anderton Andin
* ia/ssl/revert-due-to-performance-issue: Revert "ssl: Avoid creating a huge session table"
2014-06-17Merge branch 'bjorn/compiler/fix-latin1-fallback/OTP-11987' into maintBjörn Gustavsson
* bjorn/compiler/fix-latin1-fallback/OTP-11987: Fix handling of latin1 characters in false ifdef branches
2014-06-17Merge branch 'bjorn/kernel/remove-file_info-vestiges/OTP-11982' into maintBjörn Gustavsson
* bjorn/kernel/remove-file_info-vestiges/OTP-11982: Remove documentation and stub for non-exist file:file_info/1
2014-06-17Merge branch 'bjorn/erts/fix-prim_eval' into maintBjörn Gustavsson
* bjorn/erts/fix-prim_eval: add_abstract_code: Remove 'from_asm' option
2014-06-17Merge branch 'siri/ct-and-cover/OTP-11971' into maintSiri Hansen
* siri/ct-and-cover/OTP-11971: [test_server] Fix bug introduced in 5a3c466
2014-06-16Revert "ssl: Avoid creating a huge session table"Ingela Anderton Andin
This reverts commit fcc6a756277c8f041aae1b2aa431e43f9285c368.
2014-06-16[test_server] Fix bug introduced in 5a3c466Siri Hansen
This was detected by dialyzer - an '=' character too much had erronously been inserted.
2014-06-16Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green
* jjhoo/mingw_compile_fix_forceinline/OTP-11945: Fix redefinition of ETHR_FORCE_INLINE
2014-06-16Fix redefinition of ETHR_FORCE_INLINERickard Green
2014-06-16Merge branch 'siri/reltool-typo/OTP-11977' into maintSiri Hansen
* siri/reltool-typo/OTP-11977: Fix typo in error message in reltool_server
2014-06-16Merge branch 'peppe/common_test/ct_basic_html_error' into maintPeter Andersson
* peppe/common_test/ct_basic_html_error: Fix problem with mismatching html tags when running basic_html log mode OTP-11917
2014-06-16Merge branch 'peppe/common_test/ct_log_cache_error' into maintPeter Andersson
* peppe/common_test/ct_log_cache_error: Force CT log cache to rescan entries with incomplete results OTP-11988
2014-06-16Fix handling of latin1 characters in false ifdef branchesBjörn Gustavsson
The fallback to latin-1 encoding would not work if the invalid UTF-8 characters occurred in a skipped branch in an -ifdef/-ifndef.
2014-06-16Merge branch 'dgud/wx/additional-functionality/OTP-11986' into maintDan Gudmundsson
* dgud/wx/additional-functionality/OTP-11986: wx: Fix destroy bug wx: Add wxPopup(Transient)Window wx: Fix non constant define (wxSL_LABELS) wx: Add wxActivateEvent wx: Add missing wxTextCtrl:changeValue OTP-11985
2014-06-16wx: Fix destroy bugDan Gudmundsson
Do not postpone deletion of wx*DC objects since they need to be deleted directly. Otherwise, if inside showModal, causes an eternal loop of wxPaint events on Windows.
2014-06-16Merge branch 'bjorn/asn1/dialyzer-warnings/OTP-11372' into maintBjörn Gustavsson
* bjorn/asn1/dialyzer-warnings/OTP-11372: (23 commits) BER: Eliminate dialyzer warnings for specialized decode functions BER: Eliminate dialyzer warning for encoding of BIT STRINGs BER: Optimize encoding of ENUMERATED BER: Remove a redundant clause in encoding of open types (U)PER: Fix decoding of named INTEGER (U)PER: Fix encoding of a semi-constrained, named INTEGER (U)PER: Optimize handling of named BIT STRING with a lower zero bound PER: Optimize encoding of character strings with simple ranges PER: Remove unnecessary clause for handling DEFAULT (U)PER: Suppress dialyzer warnings for complete/1 Test suites: Add support for running Dialyzer on generated code Improve tests of DEFAULT values Correct OCTET STRING default when legacy_erlang_types is active Remove old DEFAULT-checking code made obsolete in the previous commit Rewrite the code for testing DEFAULT for DER Test DEFAULT more thoroughly Set.py: Correct illegal DEFAULT value BER: Optimize decoding of ENUMERATED BER: Suppress dialyzer warnings for encode_bit_string/4 BER: Inline testing of constraints when decoding ...
2014-06-16Merge branch 'hans/ssh/decode_encode_fix/OTP-11983' into maintHans Nilsson
2014-06-16ssh: Minor message encode/decode bugfixesHans Nilsson
SSH_MSG_IGNORE SSH_MSG_UNIMPLEMENTED
2014-06-16Merge branch 'hans/ssh/decode_encode_fix/OTP-11972' into maintHans Nilsson
* hans/ssh/decode_encode_fix/OTP-11972: ssh: Prepare for release ssh: Accept disconnect msgs without language tag
2014-06-16ssh: Prepare for releaseHans Nilsson
2014-06-16ssh: Accept disconnect msgs without language tagHans Nilsson
2014-06-16Merge branch 'gorillainduction/improve_mnesia_locker_complexity' into maintHenrik Nord
* gorillainduction/improve_mnesia_locker_complexity: Optimize tid lock table OTP-11981
2014-06-16Merge branch 'ia/ssl/test-cuddle' into maintIngela Anderton Andin
* ia/ssl/test-cuddle: ssl: Test case stability
2014-06-13Merge branch 'sverk/ethr_aux-cache-align-bug' into maintSverker Eriksson
* sverk/ethr_aux-cache-align-bug: erts: Fix cache line alignment bug for ts_event_pool
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-13add_abstract_code: Remove 'from_asm' optionBjörn Gustavsson
The purpose of add_abstract_code is to give Dialyzer some abstract code so that it will not fail fatally when analysing prim_eval which was compiled from BEAM assembly. But if Dialyzer were to pass along the compiler options that the module was compiled with when translating the abstract code to Core Erlang, the 'from_asm' option would crash the compilation. Thus, since we are already cheating, we should cheat a little bit more and also remove the 'from_asm' option.
2014-06-13Remove documentation and stub for non-exist file:file_info/1Björn Gustavsson
file:file_info/1 was removed a long time ago, but its documentation was not removed.
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: Test case stabilityIngela Anderton Andin
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-12Fix typo in error message in reltool_serverSiri Hansen
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 16:22:24 +0000