aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-25pubkey: Fixed unicode conversionHans Nilsson
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-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"
2014-03-25Merge branch 'kostis/dialyzer/races_type_fixes'Hans Bolinder
* kostis/dialyzer/races_type_fixes: Correct some type declarations Use the ordsets:ordset(T) type instead of defining a local one
2014-03-25Merge branch 'bjorn/erts/zlib-fix'Björn Gustavsson
* bjorn/erts/zlib-fix: zlib: Fix adler32_combine/4 and crc32_combine/4
2014-03-25Merge branch 'bjorn/asn1/ifndef-protected-hrls/OTP-11804'Björn Gustavsson
* bjorn/asn1/ifndef-protected-hrls/OTP-11804: Protect generated .hrl files from multiple inclusions
2014-03-24Merge branch 'sverk/halfword-deprecate/OTP-11777'Sverker Eriksson
* sverk/halfword-deprecate/OTP-11777: erts: Deprecate halfword emulator
2014-03-24Merge branch 'sverk/win-long-filenames/OTP-11813'Sverker Eriksson
* sverk/win-long-filenames/OTP-11813: erts: Cleanup debug tracing in win_efile.c erts: Fix file:list_dir for windows paths 258 or 259 chars long erts: Increase MAXPATHLEN to 4096 for windows erts: Fix bug in efile_readlink for long win paths kernel: Fix failed tests in prim_file_SUITE for windows erts: Fix compiler warning in win_efile.c erts: Skip tests of paths longer than 255 characters as atoms erts: Skip tests of file:set_cwd for too long path on Windows erts: Make file:make_symlink/2 return {error,eperm} on Windows erts: Revert file:set_cwd impl for windows erts: Ignore reduntant slashes in windows paths fix file_SUITE:cur_dir_0 for long windows paths erts: Fix file_SUITE:make_del_dir for long paths erts: Fix long windows paths for compressed files erts: Use GetFullPathNameW to construct abs paths from relative ones erts: Fix file driver to handle long paths on windows Conflicts: erts/emulator/drivers/win32/win_efile.c
2014-03-24erts: Cleanup debug tracing in win_efile.cSverker Eriksson
2014-03-24erts: Fix file:list_dir for windows paths 258 or 259 chars longSverker Eriksson
Appending wildcard "\*" made the path too long (>= 260 chars).
2014-03-24erts: Increase MAXPATHLEN to 4096 for windowsSverker Eriksson
2014-03-24erts: Fix bug in efile_readlink for long win pathsSverker Eriksson
2014-03-24kernel: Fix failed tests in prim_file_SUITE for windowsSverker Eriksson
2014-03-24erts: Fix compiler warning in win_efile.cSverker Eriksson
and some improved debug tracing
2014-03-24erts: Skip tests of paths longer than 255 characters as atomsSverker Eriksson
2014-03-24erts: Skip tests of file:set_cwd for too long path on WindowsSverker Eriksson
2014-03-24erts: Make file:make_symlink/2 return {error,eperm} on WindowsSverker Eriksson
if the user has not the privilege SE_CREATE_SYMBOLIC_LINK_NAME
2014-03-24sasl: Fix crash in systools_make:format_error/1Jean-Sébastien Pédron
The crash occurred when systools:make_script/2 raises the 'duplicate_modules' error. Depending on the 'silent' option, systools_make:format_error/1 is called to either format and display an error message, or return a tuple containing the error properties. When displaying a 'duplicate_modules' error message, format_error/1 receives a list of applications providing the same module(s): [ {{Mod,App1,_}, {Mod,App2,_}}, ... ] However, before this fix, format_error/1 expected the following structure, leading to a 'function_clause' exception: [ {{Mod,_,App1,_,_}, {Mod,_,App2,_,_}}, ... ] The crash never occurred with the 'silent' option, because the error and its properties are returned as is to the caller.