aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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-13Merge branch 'ia/ssl/crls-dialyzer'Ingela Anderton Andin
* ia/ssl/crls-dialyzer: ssl: Dialyzer fixes
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-12Replace "lambda head" with "fun" in compiler warningBjörn Gustavsson
We no longer use the term "lambda".
2015-03-12Remove an historical note about fun representation before R6BBjörn Gustavsson
It is hardly useful to mention that funs used to be represented as tuples in ancient releases.
2015-03-12Replace mention of a tuple fun with an external funBjörn Gustavsson
2015-03-12Update Interoperability TutorialHans Bolinder
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Hans Bolinder.
2015-03-12Update System PrinciplesHans Bolinder
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Hans Bolinder.
2015-03-12Update Erlang Reference ManualHans Bolinder
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Hans Bolinder.
2015-03-12Update Getting StartedHans Bolinder
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Hans Bolinder.
2015-03-12Update Programming ExamplesBjörn Gustavsson
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson.
2015-03-12Merge branch 'nox/maps-match_specs-fixes/OTP-12270'Björn-Egil Dahlberg
* nox/maps-match_specs-fixes/OTP-12270: erts: Strengthen maps match spec compilation tests Properly collect variables in match specs with maps Fix compilation of match specs with maps
2015-03-12Merge branch 'hb/edoc/fix_references'Hans Bolinder
* hb/edoc/fix_references: edoc: Correct documentation
2015-03-12Update OAM PrinciplesBjörn Gustavsson
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson.
2015-03-12Update Installation GuideBjörn Gustavsson
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson.
2015-03-12Update Embedded Systems User's GuideBjörn Gustavsson
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson.
2015-03-12Update Efficiency GuideBjörn Gustavsson
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson.
2015-03-12Update Design PrinciplesBjörn Gustavsson
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson.
2015-03-12edoc: Correct documentationHans Bolinder
Substitute references to edoc_lib:get_doc_env/3 for references to edoc_lib:get_doc_env/4.
2015-03-12Merge branch 'maint'Zandra Hird
2015-03-12Merge branch 'shijiang1130/master' into maintZandra Hird
* shijiang1130/master: Add client example for using the SSH module OTP-12558
2015-03-12Merge branch 'maint'Henrik Nord
Conflicts: erts/emulator/hipe/hipe_bif0.c
2015-03-12Merge branch 'mikpe/hipe-mfait-rwlock' into maintHenrik Nord
* mikpe/hipe-mfait-rwlock: hipe: change mfa_info_table lock to rwmutex OTP-12557
2015-03-12Merge branch 'mikpe/avoid-oversize-bignums' into maintHenrik Nord
* mikpe/avoid-oversize-bignums: don't leave a heap hole in erts_bs_get_integer_2 don't create oversize bignums in binary matching OTP-12556
2015-03-12Merge branch 'egil/beam/select_val/OTP-12555'Björn-Egil Dahlberg
* egil/beam/select_val/OTP-12555: erts: Use linear search for small select_val arrays
2015-03-12Merge branch 'maint'Björn Gustavsson
* maint: asn1ct_gen: Correct generation of .hrl files for multiple ellipses Fix BER code generation
2015-03-12Merge branch 'egil/process_dictionary-initial-size/OTP-12535'Björn-Egil Dahlberg
* egil/process_dictionary-initial-size/OTP-12535: erts: Document option 'hpds' erts: Enable command line argument for initial pd size
2015-03-12Merge branch 'egil/revert-os_getenv-test_server'Björn-Egil Dahlberg
* egil/revert-os_getenv-test_server: Revert "Start using os:getenv/2 fun" in test_server
2015-03-12Create new BIF ets:update_counter/4Anthony Ramine
Conflicts: erts/emulator/beam/bif.tab lib/stdlib/src/ets.erl
2015-03-12Merge branch 'bjorn/asn1/double-ellipses/OTP-12546' into maintBjörn Gustavsson
* bjorn/asn1/double-ellipses/OTP-12546: asn1ct_gen: Correct generation of .hrl files for multiple ellipses Fix BER code generation
2015-03-12erts: Strengthen maps match spec compilation testsBjörn-Egil Dahlberg
2015-03-11ssl: Dialyzer fixesIngela Anderton Andin