aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-03-26ssh: Added option negotiation_timeout for ssh:daemonHans Nilsson
This option is for closing a connection where the client connects, but then do nothing except keeping server resources.
2014-03-26Merge branch 'dgud/test_server/throw_skip'Dan Gudmundsson
* dgud/test_server/throw_skip: test_server: Allow init_per_ function to throw skip
2014-03-26Merge branch 'egil/maps-compiler-coverage'Björn-Egil Dahlberg
* egil/maps-compiler-coverage: compiler: Do not evaluate map expressions with bad keys compiler: Throw 'nomatch' on matching with bad binary keys compiler: Variable keys are not allowed in Maps compiler: Strengthen Maps warnings tests compiler: map_pair cannot be a type clause in v3_life compiler: Remove redudant code in v3_codegen compiler: Test deep map structure compiler: Remove redundant clause in v3_codegen compiler: Cover #{ [] => Var } in testcase
2014-03-26Update primary bootstrapBjörn Gustavsson
2014-03-26Merge branch 'nox/compiler/non-matching-patterns-with-literals'Björn Gustavsson
* nox/compiler/non-matching-patterns-with-literals: Correctly handle non-matching patterns against literal values
2014-03-26Merge branch 'bjorn/stdlib/otp_internal'Björn Gustavsson
* bjorn/stdlib/otp_internal: otp_internal: No longer warn for funtions removed in R13B otp_internal: Postpone removals from R17 to OTP 18
2014-03-26Merge branch 'hb/refman/callback_attribute/OTP-11657'Hans Bolinder
* hb/refman/callback_attribute/OTP-11657: refman: Clarify the '-callback' attribute
2014-03-26refman: Clarify the '-callback' attributeHans Bolinder
2014-03-26Merge branch 'bmk/snmp/manager/fix-tests'Micael Karlberg
2014-03-26Merge branch 'bmk/snmp/agent/fix-tests'Micael Karlberg
2014-03-26Merge branch 'hans/ssl/add_pull_req_crl_fixes/OTP-11761'Hans Nilsson
* hans/ssl/add_pull_req_crl_fixes/OTP-11761: ssl, pubkey: Code and test adjustments Rework IDP validation according to the RFC, fix public_key tests Various improvements to CRL handling
2014-03-26ssl, pubkey: Code and test adjustmentsHans Nilsson
2014-03-26Rework IDP validation according to the RFC, fix public_key testsAndrew Thompson
2014-03-26Various improvements to CRL handlingAndrew Thompson
* Handle v1 CRLs, with no extensions. * Compare the IDP on a CRL correctly, if present * Don't try to double-decode altnames Tests are also included, and the make_certs testing tool in the SSL application has been greatly extended.
2014-03-26Merge branch 'dumbbell/function_clause-in-systools_make-format_error'Siri Hansen
* dumbbell/function_clause-in-systools_make-format_error: sasl: Fix crash in systools_make:format_error/1 OTP-11819
2014-03-26Merge branch 'hans/pubkey/utf8/OTP-11823'Hans Nilsson
* hans/pubkey/utf8/OTP-11823: pubkey: Fixed unicode conversion
2014-03-26Merge branch 'ia/inets/cuddle-tests'Ingela Anderton Andin
* ia/inets/cuddle-tests: inets: Remove potential windows problem
2014-03-26Merge branch 'ia/ssl/continue-dtls-and-specs'Ingela Anderton Andin
* ia/ssl/continue-dtls-and-specs: ssl: Avoid dialyzer warnings in dtls code ssl: Improve type specs ssl: Refactor and start implementing dtls_connection.erl
2014-03-26Merge branch 'ia/ssl/sni-alert/OTP-11815'Ingela Anderton Andin
* ia/ssl/sni-alert/OTP-11815: ssl: Handle SNI alert unrecognized_name and gracefully deal with unexpected alerts.
2014-03-26Merge branch 'aronisstav/hipe/opaque_fix'Hans Bolinder
* aronisstav/hipe/opaque_fix: Don't 'opaque-decorate' a success typing using an incompatible spec
2014-03-25compiler: Do not evaluate map expressions with bad keysBjörn-Egil Dahlberg
Map keys with large (non literal) binary keys must fail.
2014-03-25compiler: Throw 'nomatch' on matching with bad binary keysBjörn-Egil Dahlberg
Even if a binary key is written as a literal the compiler may choose to make an expression. Emit a warning in those cases and saying the case will not match. This is a limitation in current implementation.
2014-03-25compiler: Variable keys are not allowed in MapsBjörn-Egil Dahlberg
No need to check for variables in Map keys.
2014-03-25pubkey: Fixed unicode conversionHans Nilsson
2014-03-25compiler: Strengthen Maps warnings testsBjörn-Egil Dahlberg
Increases coverage.
2014-03-25Merge branch 'sverk/maps_remove_bug'Sverker Eriksson
* sverk/maps_remove_bug: erts: Fix heap overflow in maps:remove/2 when key is not found
2014-03-25Merge branch 'sverk/win-warning-io'Sverker Eriksson
* sverk/win-warning-io: erts: Fix compile warning in io.c for windows
2014-03-25ssl: Avoid dialyzer warnings in dtls codeIngela Anderton Andin
Even if DTLS is not finished, e.i. not runnable yet we want to phase in the code together with refactoring of TLS code, but without introducing warnings in the release.
2014-03-25ssl: Improve type specsIngela Anderton Andin
Conflicts: lib/ssl/src/dtls_record.erl
2014-03-25compiler: map_pair cannot be a type clause in v3_lifeBjörn-Egil Dahlberg
Map pairs are encapsulated in a map.
2014-03-25ssl: Refactor and start implementing dtls_connection.erlIngela Anderton Andin
2014-03-25Merge branch 'hans/ssh/dialyzer_warning/OTP-11821'Hans Nilsson
2014-03-25Merge branch 'ks/hipe-rtl-remove-constant/OTP-11822'Björn-Egil Dahlberg
* ks/hipe-rtl-remove-constant/OTP-11822: Remove RTL code that handled the (is_)constant guard
2014-03-25ssh: Fix dialyzer warning for arg Data in ssh_connection_handler:send/4Hans Nilsson
2014-03-25erts: Fix compile warning in io.c for windowsSverker Eriksson
2014-03-25Merge branch 'hans/eldap/asn1_bin_lists/OTP-11768'Hans Nilsson
* hans/eldap/asn1_bin_lists/OTP-11768: eldap: Fix asn.1 decode into binaries
2014-03-25Merge branch 'paulgray/dtrace_snprintf_fix/OTP-11816'Lukas Larsson
* paulgray/dtrace_snprintf_fix/OTP-11816: Fix DTrace/SystemTap-related formatting
2014-03-25Fix DTrace/SystemTap-related formattingScott Lystig Fritchie
Thanks to Michał Ptaszek for bringing this embarrassing formatting error to my attention. Many DTrace/SystemTap trace strings are incorrectly truncated at 4/8 bytes, depending on the CPU word size. This patch expands the work from commit d032e097 by zheng siyao. Michał's report to the erlang-bugs list can be found at: http://erlang.org/pipermail/erlang-bugs/2014-March/004250.html Conflicts: erts/emulator/beam/beam_emu.c erts/emulator/beam/copy.c erts/emulator/beam/dist.c erts/emulator/beam/erl_async.c erts/emulator/beam/erl_bif_port.c erts/emulator/beam/erl_port_task.c erts/emulator/beam/erl_process.c erts/emulator/beam/io.c
2014-03-25Merge branch 'peppe/common_test/telnet_expect_timeout'Peter Andersson
* peppe/common_test/telnet_expect_timeout: Add test cases Introduce total timeout value in ct_telnet:expect/3 options OTP-11689
2014-03-25Merge branch 'peppe/common_test/cth_surefire_crash'Peter Andersson
* peppe/common_test/cth_surefire_crash: Prevent cth_surefire hook from crashing if previous hook returns fail or skip. OTP-11811
2014-03-25Merge branch 'peppe/common_test/dialyzer_warnings'Peter Andersson
* peppe/common_test/dialyzer_warnings: Update incorrect type specifications Fix code to get rid of dialyzer warnings Remove dead code
2014-03-25Merge branch 'peppe/common_test/master_test_timeout'Peter Andersson
* peppe/common_test/master_test_timeout: Shorten default timetrap timeout for ct_master test suite
2014-03-25Merge branch 'vladdu/unicode_parameters_doc'Siri Hansen
* vladdu/unicode_parameters_doc: Specify that +fn* flags affect even command-line parameters and environment variables OTP-11818
2014-03-25Merge branch 'vinoski/sys-get-rep-state2'Siri Hansen
* vinoski/sys-get-rep-state2: remove tuple funs from special process documentation fix sys:get_state/1,2 and sys:replace_state/2,3 when sys suspended OTP-11817
2014-03-25Merge branch 'paulgray/dtrace_snprintf_fix/OTP-11816'Lukas Larsson
* paulgray/dtrace_snprintf_fix/OTP-11816: Pass full strings to DTrace probes
2014-03-25ssl: Handle SNI alert unrecognized_name and gracefully deal withIngela Anderton Andin
unexpected alerts. Add recognitions of RFC 4366 alerts and handle possible unimplementd alerts in a gracefully way.
2014-03-25Merge branch 'siri/ct_netconfc-dialyzer'Siri Hansen
* siri/ct_netconfc-dialyzer: Fix some dialyzer warnings in ct_netconfc
2014-03-25Merge branch 'hb/stdlib/erl_parse_abstract/OTP-11807'Hans Bolinder
* hb/stdlib/erl_parse_abstract/OTP-11807: stdlib: Generalize erl_parse:abstract/2
2014-03-25stdlib: Generalize erl_parse:abstract/2Hans Bolinder
The 'encoding' option of erl_parse:abstract/2 has been extended to include 'none' and a callback function (a predicate). The rationale is that a more general means of determining what integer lists are to be represented as strings may help readability when generating Erlang code given input in some other encoding than Latin-1 or UTF-8.
2014-03-25Merge branch 'siri/release-name/OTP-11736'Siri Hansen
* siri/release-name/OTP-11736: Update primary bootstrap Change release name from "OTP APN 181 01" to "Erlang/OTP"