aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-17Merge branch 'maint'Rickard Green
* maint: Add support for patching of individual applications Conflicts: system/doc/installation_guide/part.xml
2015-03-17Merge branch 'rickard/otp_patch_apply/OTP-12565' into maintRickard Green
* rickard/otp_patch_apply/OTP-12565: Add support for patching of individual applications
2015-03-17Add support for patching of individual applicationsRickard Green
2015-03-17ssl: Add TLS-ALPN supportLoïc Hoguin
This commit adds support for RFC7301, application-layer protocol negotiation. ALPN is the standard based approach to the NPN extension, and is required for HTTP/2. ALPN lives side by side with NPN and provides an equivalent feature but in this case it is the server that decides what protocol to use, not the client. When both ALPN and NPN are sent by a client, and the server is configured with both ALPN and NPN options, ALPN will always take precedence. This behavior can also be found in the OpenSSL implementation of ALPN. ALPN and NPN share the ssl:negotiated_protocol/1 function for retrieving the negotiated protocol. The previously existing function ssl:negotiated_next_protocol/1 still exists, but has been deprecated and removed from the documentation. The tests against OpenSSL require OpenSSL version 1.0.2+.
2015-03-17Correct links in the system documentationHans Bolinder
2015-03-17Merge branch 'ia/ssl/crl/doc'Ingela Anderton Andin
* ia/ssl/crl/doc: ssl: Improve documentation
2015-03-17ssl: Improve documentationIngela Anderton Andin
2015-03-17PER, UPER: Eliminate compiler warning for SeqPrim.asn1Björn Gustavsson
The BEAM compiler now warns more aggressively for expressions whose values are not used. For example, the generated Erlang code for the following ASN.1 code will now cause a warning: Seq ::= SEQUENCE { ..., os OCTET STRING (SIZE (17000..30000)) } The generated Erlang code looks similar to the following: Enc9@bin = iolist_to_binary(Enc9@output), Enc9@len = byte_size(Enc9@bin), [align|encode_fragmented(Enc9@bin, 8)] The variable Enc9@len is not used and the BEAM compiler will complain that the value returned from the byte_size/1 call is not used. Improve the optimization of the intermediate code to eliminate the assignment to the unused variable.
2015-03-17update preloadedZandra Hird
2015-03-17Merge branch 'essen/zlib-windowbits'Zandra Hird
* essen/zlib-windowbits: Update zlib:zwindowbits/0 type to accept 8 and -8 OTP-12564
2015-03-16Fix tags completion in erlang.el for GNU Emacs 23+Johan Claesson
The tag completion code was changed in GNU Emacs 23.1 in a way that broke erlang.el tag completion. This commit fix that for Emacs 23.1 and later. Add progress report while building completion table. Add completion of module_info/0 for all modules. Add lib/tools/emacs/*.elc to .gitignore.
2015-03-16Merge branch 'nox/ets-update_counter-4'Zandra Hird
* nox/ets-update_counter-4: Create new BIF ets:update_counter/4 Allow 4-ary BIFs OTP-12563
2015-03-16Update primary bootstrapBjörn Gustavsson
2015-03-16Merge branch 'bjorn/compiler/optimizations'Björn Gustavsson
* bjorn/compiler/optimizations: v3_life: Combine literal/2 and literal2/2 v3_codegen: Don't save options in the process dictionary Don't inline core_parse v3_core: Teach pat_alias/2 to eliminate duplicated variables beam_dead: Improve optimization by eliminating fallthroughs beam_dead: Optimize Var =:= Var beam_peep: Optimize away redundant use of is_boolean tests beam_bool: Correct initialized_regs/2 sys_core_fold: Generalize case optimization sys_core_fold: Improve optimization of 'not' sys_core_fold: Suppress compiler warnings when evaluating element/2 Clean up evaluation of setelement/3 Replace '==' with '=:=' when both operands are integers Update type information based on BIFs that returns integers sys_core_fold: Strengthen type optimization in lets
2015-03-16Merge branch 'maint'Ingela Anderton Andin
2015-03-16Merge branch 'ia/public_key/crls_dialyzer' into maintIngela Anderton Andin
* ia/public_key/crls_dialyzer: public_key: dialyzer fixes
2015-03-16Merge branch 'bjorn/system-documentation'Björn Gustavsson
* bjorn/system-documentation: Replace "lambda head" with "fun" in compiler warning Remove an historical note about fun representation before R6B Replace mention of a tuple fun with an external fun Update Interoperability Tutorial Update System Principles Update Erlang Reference Manual Update Getting Started Update Programming Examples Update OAM Principles Update Installation Guide Update Embedded Systems User's Guide Update Efficiency Guide Update Design Principles
2015-03-16Merge branch 'maint'Hans Nilsson
2015-03-16Merge branch 'hans/version_updates' into maintHans Nilsson
2015-03-16ssh: uppdate version in vsn.mkHans Nilsson
2015-03-16eldap: uppdate version in vsn.mkHans Nilsson
2015-03-16Merge branch 'ia/ssl/crls-dialyzer2'Ingela Anderton Andin
* ia/ssl/crls-dialyzer2: ssl: Fix incorrect argument handling, thanks to dialyzer
2015-03-16ssl: Fix incorrect argument handling, thanks to dialyzerIngela Anderton Andin
2015-03-16Merge branch 'maint'Zandra Hird
2015-03-16Merge branch 'nlmills/docfix' into maintZandra Hird
* nlmills/docfix: Correct typo in erlang(3) documentation
2015-03-16Minor comment fixKirill Zaborsky
2015-03-15Modify the top section of the test case log filePeter Andersson
2015-03-14Remove unused time macros from efile_drvNick Mills
All uses of these macros were removed in commit c3a615aa2da09bc3a0575e973959f800460a63de.
2015-03-13erts: Enhance maps ordering testsBjörn-Egil Dahlberg
2015-03-13Merge branch 'ia/ssl/crls-dialyzer'Ingela Anderton Andin
* ia/ssl/crls-dialyzer: ssl: Dialyzer fixes
2015-03-13hipe: Fix maps sort order testcaseBjörn-Egil Dahlberg
2015-03-13add handle data type in zip.xml to fix broken linkZandra Hird
2015-03-13erts: Remove unused variable in crashdump creationBjörn-Egil Dahlberg
2015-03-13erts: Fix typo in copy_struct for halfword emulatorBjörn-Egil Dahlberg
2015-03-13Modify the xcomp file for ARM and enable more flagsPeter Andersson
2015-03-13erts: Restrict GCC intrinsics by compiler versionBjörn-Egil Dahlberg
Intrinsics __builtin_clz and __builtin_popcount are only valid on GCC version 3.4 and above.
2015-03-13Fix problem with variables not getting assigned during installationPeter Andersson
2015-03-13Merge branch 'maint'Raimo Niskanen
2015-03-13Merge branch 'raimo/infinite-loop-gethostbyname/OTP-12133' into maintRaimo Niskanen
* raimo/infinite-loop-gethostbyname/OTP-12133: Restore lookup order after test
2015-03-13public_key: dialyzer fixesIngela Anderton Andin
2015-03-12erts: Fix windows bug in hashmap_infoSverker Eriksson
undefined symbol 'MAX'
2015-03-12erts: Fix typo in make_hash2 for 32-bit archSverker Eriksson
2015-03-12Fix beam_load assertBjörn-Egil Dahlberg
2015-03-12erts: Set Maps small limit to 32 itemsBjörn-Egil Dahlberg
Use small limit 3 in debug case
2015-03-12erts: Cleanup comments for make_internal_hashSverker Eriksson
2015-03-12erts: Fix nif API for hashmapsSverker Eriksson
2015-03-12erts: Make hashmap iterator more flexibleSverker Eriksson
to allow mixing of 'next' and 'prev' operations.
2015-03-12erts, kernel: Fix erts_debug:size/1 for hashmapsBjörn-Egil Dahlberg
This commit introduces two BIFs: * erts_internal:map_type/1 * erts_internal:map_hashmap_children/1 erts_internal:map_hashmap_children/1 is only intended for use within erts_debug:size/1 since the internal hashmap node is not allowed to leak anywhere.
2015-03-12erts: Add hashmap construction to driver APIBjörn-Egil Dahlberg
2015-03-12erts: Reintroduce is_map macroSverker Eriksson
as shorthand for is_flatmap || is_hashmap