aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-11-16ssl: Resolve merge conflict resolution errorIngela Anderton Andin
2017-11-16Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/ssl_handshake.erl lib/ssl/src/tls_connection.erl
2017-11-16Merge branch 'ingela/ssl/code-enhance' into maintIngela Anderton Andin
* ingela/ssl/code-enhance: ssl: Align code of TLS/DTLS handshake handling ssl: Align code of TLS/DTLS record handling ssl: Align code of main modules implementing the gen_statem behaviour dtls: Add state spec
2017-11-16ssl: Align code of TLS/DTLS handshake handlingIngela Anderton Andin
2017-11-16ssl: Align code of TLS/DTLS record handlingIngela Anderton Andin
2017-11-16ssl: Align code of main modules implementing the gen_statem behaviourIngela Anderton Andin
2017-11-16dtls: Add state specIngela Anderton Andin
2017-11-15Merge branch 'maint'Hans Bolinder
* maint: edoc: The map type is denoted map()
2017-11-15Merge branch 'hasse/edoc/fix_map_type/OTP-14777' into maintHans Bolinder
* hasse/edoc/fix_map_type/OTP-14777: edoc: The map type is denoted map()
2017-11-15Merge pull request #1602 from sirihansen/siri/supervisor/store-children-in-mapSiri Hansen
Refactor supervisor, and store children in a map instead of a list OTP-14586
2017-11-15Merge PR-1605 from sverker/sverker/binary_to_term-used OTP-14780Sverker Eriksson
Add 'used' option for binary_to_term/2
2017-11-15Merge PR-1621 from margnus1/hipe-literal-tagSverker Eriksson
HiPE: Support for literal tag, tests and bugfixes
2017-11-15Merge branch 'maint'Sverker Eriksson
2017-11-15Merge branch 'sverker/test-cuddle' into maintSverker Eriksson
2017-11-14[supervisor] Add test of scaling on start/stop of many childrenSiri Hansen
2017-11-14edoc: The map type is denoted map()Hans Bolinder
The map type was erroneously displayed as "#{}", the empty map type.
2017-11-14Add ignore option to transform_table fun (#1614)Bernard Duggan
2017-11-14Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Display error messages without call stack
2017-11-14Merge branch 'hasse/dialyzer/fix_crash_msg/OTP-14742' into maintHans Bolinder
* hasse/dialyzer/fix_crash_msg/OTP-14742: dialyzer: Display error messages without call stack
2017-11-13Merge pull request #1624 from bjorng/bjorn/add-beam-internal-docBjörn Gustavsson
Add internal documentation for the beam_makeops script OTP-14626
2017-11-13Update primary bootstrapBjörn Gustavsson
2017-11-13Merge branch 'maint'Björn Gustavsson
* maint: Recognize 'deterministic' when given in a -compile() attribute Conflicts: lib/compiler/src/beam_asm.erl
2017-11-13Merge branch 'bjorn/compiler/fix-deterministic-attribute/ERL-498' into maintBjörn Gustavsson
* bjorn/compiler/fix-deterministic-attribute/ERL-498: Recognize 'deterministic' when given in a -compile() attribute OTP-14773
2017-11-13Merge branch 'maint'Ingela Anderton Andin
2017-11-13Merge branch 'ingela/ssl/doc-link-fix' into maintIngela Anderton Andin
* ingela/ssl/doc-link-fix: ssl: Fix broken link in doc
2017-11-13Document beam_makeopsBjörn Gustavsson
2017-11-13Refuse to load "literals" that can be confused with registersBjörn Gustavsson
The 's' operand overloads the tags for pids and ports to represent X and Y registers, respectively. At load time, refuse to load the module if the "literal" term is not a pid or port, as it would be interpreted as a register. This does not happen with normally compiled code, but it can happen if the compiler (or beam_asm) is abused like in the following example: make_bad() -> Pid = self(), Forms = [{attribute, 0, module, bad_s_operand}, {attribute, 0, export, [{test, 0}]}, {function, 0, test, 0, [{clause, 0, [], [], [{call,0,{atom,0,tuple_size},[{integer, 0, Pid}]}]}]}], {ok, Module, Bin} = compile:forms(Forms, [no_copt,no_postopt,report_errors]), code:load_binary(Module, "bad_s_operand.erl", Bin). With this commit applied, the following message will be printed when make_bad() is run: =ERROR REPORT==== 10-Nov-2017::14:47:59 === Loading of bad_s_operand.erl failed: badfile =ERROR REPORT==== 10-Nov-2017::14:47:59 === beam/beam_load.c(2396): Error loading function bad_s_operand:test/0: op bif1_body: bsd: the term '<0.60.0>' would be confused with a register
2017-11-13ssl: Fix broken link in docIngela Anderton Andin
2017-11-10dialyzer: Display error messages without call stackHans Bolinder
As of commit 12b379 many of the reasons displayed after "Analysis failed with error:" erroneously include a call stack. The bug is now corrected. The bug was pointed out in http://erlang.org/pipermail/erlang-questions/2017-October/093838.html.
2017-11-10Merge branch 'maint'Ingela Anderton Andin
* maint: Updated OTP version Update release notes Update version numbers inets: Prepare for release inets: Add missing guard Avoid WindowBits=8 as per the manual Fix deflateParams on zlib 1.2.11 Ignore empty binaries in enif_inspect_iovec Emasculate writable binaries on entering an iovec Only apply EOS behaviors if there's pending data Conflicts: OTP_VERSION
2017-11-10Merge branch 'maint-20' into maintIngela Anderton Andin
* maint-20: Updated OTP version Update release notes Update version numbers inets: Prepare for release inets: Add missing guard Avoid WindowBits=8 as per the manual Fix deflateParams on zlib 1.2.11 Ignore empty binaries in enif_inspect_iovec Emasculate writable binaries on entering an iovec Only apply EOS behaviors if there's pending data Stop assuming that all schedulers are managed when updating msacc
2017-11-10Merge branch 'bjorn/cuddle-with-tests'Björn Gustavsson
* bjorn/cuddle-with-tests: Skip compile_SUITE:pre_load_check/1 when code is native-compiled
2017-11-10Merge branch 'maint'Ingela Anderton Andin
2017-11-10Merge branch 'ingela/snmp/cuddle' into maintIngela Anderton Andin
* ingela/snmp/cuddle: snmp: Correct netsnmp arglist and check for usable netsnmp
2017-11-10Merge branch 'maint'Ingela Anderton Andin
2017-11-10Merge branch 'ingela/ssl/engine-API/OTP-14448' into maintIngela Anderton Andin
* ingela/ssl/engine-API/OTP-14448: ssl: Add private key configuration for crypto engine
2017-11-10Merge branch 'maint'Hans Nilsson
2017-11-10Merge branch 'hans/ssh/hostkey_in_engine/OTP-14757' into maintHans Nilsson
2017-11-10ssh: Document engine_key_ref() returned from ssh_server_key:host_key/2Hans Nilsson
2017-11-10ssh: Update ssh_{server|client}_key doc to what it should have beenHans Nilsson
2017-11-10ssh: New test suite for engine-stored keysHans Nilsson
2017-11-10ssh: Update SSH for engine-stored host keysHans Nilsson
2017-11-10crypto: Doc privkey_to_pubkey/2Hans Nilsson
2017-11-10crypto: Extend engine_SUITE with tests of the pub key extraction from priv keysHans Nilsson
2017-11-10crypto: Add privkey_to_pubkey/2 to get the public key from a priv key in an ↵Hans Nilsson
Engine Only RSA and DSA so far.
2017-11-10Merge branch 'maint'Hans Nilsson
2017-11-10Merge branch 'hans/crypto/engine_pkey_load/OTP-14448' into maintHans Nilsson
2017-11-10crypto: Remove unused 'atom_bad_engine'Hans Nilsson
2017-11-10crypto: Remove 'relasenotes.xml' from doc/src/MakefileHans Nilsson
2017-11-10crypto: Extend engine_SUITE with tests of the pub/priv key fetchesHans Nilsson
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-23 14:38:55 +0000