aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-02-29wx: Remove http_util usageDan Gudmundsson
Use erlang builtin list_to_integer instead
2016-02-29wx: Tiny optimizationDan Gudmundsson
Set context to avoid future lookups
2016-02-23wx: Fix a crash with sending two binaries to command queueDan Gudmundsson
Introduced when I optimized the binary handling.
2016-02-23Merge branch 'maint-18' into maintHenrik Nord
2016-02-22Merge branch 'rickard/dw-cmpxchg-clang/OTP-13336' into maintRickard Green
* rickard/dw-cmpxchg-clang/OTP-13336: Improve cmpxchg8b/cmpxchg16b inline asm
2016-02-22Merge branch 'rickard/gcc5-pic-cmpxchg8b/OTP-13326' into maintRickard Green
* rickard/gcc5-pic-cmpxchg8b/OTP-13326: Improve cmpxchg8b inline asm configure test
2016-02-22Merge branch 'sverk/proc-lock-check-fix' into maintSverker Eriksson
* sverk/proc-lock-check-fix: erts: Fix lock checker for process locks
2016-02-22Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maintHans Bolinder
* hb/add_dialyzer_suppressions/OTP-12862: Fix a few dialyzer warnings
2016-02-22Fix a few dialyzer warningsHans Bolinder
2016-02-22Merge branch 'ia/ssl/connection_information/OTP-13232/OTP-13343' into maintIngela Anderton Andin
* ia/ssl/connection_information/OTP-13232/OTP-13343: ssl: Newer cipher suites now presented correctly ssl: Include options form connect/listen/accept in connection_information/[1,2]
2016-02-22ssl: Newer cipher suites now presented correctlyIngela Anderton Andin
Older SSL/TLS versions have cipher suites that look like {key_exchange(), cipher(), MAC::hash()} and the hash function used by the PRF (Pseudo Random function) is implicit and always the same for that protocol version. In TLS 1.2 a cipher suite is {key_exchange(), cipher(), MAC::hash(), PRF::hash()}. Internally a cipher suite is always a four tuple but for backwards compatibility older cipher suites will be presented as a three tuples, however new cipher suites should be presented as four tuples.
2016-02-22Merge branch 'dgud/debugger/doc' into maintDan Gudmundsson
* dgud/debugger/doc: debugger: Editorial changes in documentation
2016-02-22debugger: Editorial changes in documentationxsipewe
2016-02-22Merge branch 'dgud/observer/doc' into maintDan Gudmundsson
* dgud/observer/doc: Observer: Editorial changes in documentation
2016-02-22Observer: Editorial changes in documentationtmanevik
2016-02-22ssl: Include options form connect/listen/accept in connection_information/[1,2]Ingela Anderton Andin
Make sure that options only relevant for one role (client|server) is set to undefined when the other role is invoked. As there are many options to ssl, and many are optional, we choose to filter out all undefined options to avoid overwhelming the user with not relevant information. This way there is no need for any special handling of the role specific options which is also nice.
2016-02-19Merge branch 'rickard/rq-state-bug/OTP-13298' into maintRickard Green
* rickard/rq-state-bug/OTP-13298: Fix bug causing run-queue mask to become inconsistent
2016-02-19Merge branch 'ia/pr/public_key-typos' into maintIngela Anderton Andin
* ia/pr/public_key-typos: Fix public_key documentation typos To correct version of public_key doc in maint, due to a missed push of maint but a push of the maint to master merge, some confusion was caused. Also the original branch (ia/pr/typo-fixes) included ssl typo fixes that where cherry picked and merged from another branch to add to the confusion.
2016-02-19Fix public_key documentation typosMagnus Henoch
2016-02-18erts: Fix lock checker for process locksSverker Eriksson
Do lock order check *before* trying to seize lock... duh!
2016-02-18Improve cmpxchg8b/cmpxchg16b inline asmRickard Green
Clang didn't like that ecx/rcx was mapped to input and output variables of different types.
2016-02-18Merge branch 'sverk/nif-test-cuddle' into maintSverker Eriksson
* sverk/nif-test-cuddle: erts: Fix wobbling test failure in nif_SUITE
2016-02-18Merge branch 'sverk/openssl-config-doc' into maintSverker Eriksson
* sverk/openssl-config-doc: Add --with-ssl-incl and --with-ssl-rpath to docs
2016-02-18Add --with-ssl-incl and --with-ssl-rpath to docsSverker Eriksson
2016-02-18Updated OTP versionOTP-18.2.4Erlang/OTP
2016-02-18Prepare releaseErlang/OTP
2016-02-18Merge branch 'siri/ct_netconfc/multpile-end-tags/OTP-13323' into maint-18Erlang/OTP
* siri/ct_netconfc/multpile-end-tags/OTP-13323: [ct_netconfc] Fix XML parsing when multiple messages in package
2016-02-18[ct_netconfc] Fix XML parsing when multiple messages in packageSiri Hansen
If a ssh package contained more than one netconf end tag, then the second end tag was never detected in ct_netconfc:handle_data. Instead it was included in the XML data given to the xmerl parser, which then failed with reason "\"]]>\" is not allowed in content". This problem was introduced by OTP-13007.
2016-02-18Merge branch 'legoscia/ssl-doc-typos' into maintHenrik Nord
* legoscia/ssl-doc-typos: Fix typos in ssl.xml OTP-13339
2016-02-18Merge branch 'msantos/ms/typo-windows-build-script' into maintHenrik Nord
* msantos/ms/typo-windows-build-script: Fix typo in Windows build scripts OTP-13337
2016-02-18Merge branch 'hb/kernel/correct_contract/OTP-13335' into maintHans Bolinder
* hb/kernel/correct_contract/OTP-13335: kernel: Correct contract for inet:getifaddrs/1
2016-02-17Improve cmpxchg8b inline asm configure testRickard Green
2016-02-17kernel: Correct contract for inet:getifaddrs/1Hans Bolinder
See also http://bugs.erlang.org/browse/ERL-95.
2016-02-17Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maintHans Bolinder
* hb/add_dialyzer_suppressions/OTP-12862: xmerl: Remove 'no_return' Dialyzer warnings xmerl: Add suppression of Dialyzer warnings eunit: Add suppression of Dialyzer warnings debugger: Add suppression of Dialyzer warnings kernel: Add suppression of Dialyzer warnings mnesia: Add suppression of Dialyzer warnings observer: Add suppression of Dialyzer warnings runtime_tools: Add suppression of Dialyzer warnings stdlib: Add suppression of Dialyzer warnings test_server: Add suppression of Dialyzer warnings tools: Add suppression of Dialyzer warnings
2016-02-17xmerl: Remove 'no_return' Dialyzer warningsHans Bolinder
2016-02-17xmerl: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17eunit: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17debugger: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17kernel: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17mnesia: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17observer: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17runtime_tools: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17stdlib: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17test_server: Add suppression of Dialyzer warningsHans Bolinder
2016-02-17tools: Add suppression of Dialyzer warningsHans Bolinder
2016-02-16Merge branch 'ia/pr/958/OTP-13334' into maintIngela Anderton Andin
* ia/pr/958/OTP-13334: ssl: verify cert signature against original cert binary
2016-02-15Merge branch 'tuncer/ei-breakage' into maintHenrik Nord
* tuncer/ei-breakage: ei: fix breakage reported by Sergei Golovan Revert "musl: fix gethostbyname_r/gethostbyaddr_ selection" OTP-13328
2016-02-15Merge branch 'bjorn/asn1/suppressions/OTP-13324' into maintBjörn Gustavsson
* bjorn/asn1/suppressions/OTP-13324: asn1: Suppress warnings for improper lists in generated code
2016-02-12erts: Fix wobbling test failure in nif_SUITESverker Eriksson
ResA may have been GC'd after its last use.
2016-02-12asn1: Suppress warnings for improper lists in generated codeBjörn Gustavsson