aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-08-08Merge branch 'duncaen/crypto/fix-algo_cipher-array-size/PR-1140/OTP-13789' ↵Raimo Niskanen
into maint * duncaen/crypto/fix-algo_cipher-array-size/PR-1140/OTP-13789: Fix segfault in crypto by increasing algo_cipher array
2016-08-05Merge branch 'maint-18' into maintHans Nilsson
Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/test/ssh_sup_SUITE.erl lib/ssh/vsn.mk otp_versions.table
2016-08-05Update primary bootstrapBjörn Gustavsson
2016-08-05Merge branch 'bjorn/compiler/not_live/ERL-202/OTP-13780' into maintBjörn Gustavsson
* bjorn/compiler/not_live/ERL-202/OTP-13780: beam_block: Fix potentially unsafe optimization in move_allocates/1
2016-08-05beam_block: Fix potentially unsafe optimization in move_allocates/1Björn Gustavsson
beam_block has an optimization that only is safe when it is applied immediately after code generation. That is pointed out in a comment: NOTE: Moving allocation instructions is only safe because it is done immediately after code generation so that we KNOW that if {x,X} is initialized, all x registers with lower numbers are also initialized. That assumption may not be true after other optimizations, such as the beam_utils:live_opt/1 optimization. The new beam_reorder pass added in OTP 19 runs before beam_block. Therefore, the optimization is potentially unsafe. The optimization is also unsafe if compilation is started from assembly code in a .S file. Rewrite the optimization to make it safe. See the newly added comment for details. ERL-202
2016-08-05Merge branch 'elbrujohalcon/dialyzer/fix-spec/PR-1134/OTP-13786' into maintBjörn Gustavsson
* elbrujohalcon/dialyzer/fix-spec/PR-1134/OTP-13786: Improve format_warning/1 spec
2016-08-04Updated OTP versionOTP-18.3.4.3Erlang/OTP
2016-08-04Update release notesErlang/OTP
2016-08-04Merge branch 'hans/ssh/sup_fix_ssh_supc_type/OTP-13782' into maint-18Erlang/OTP
* hans/ssh/sup_fix_ssh_supc_type/OTP-13782: ssh: update test suite for supervisors ssh: sshc_sup to use worker for ssh_con_handler ssh: update version number
2016-08-04ssh: update test suite for supervisorsHans Nilsson
2016-08-04ssh: sshc_sup to use worker for ssh_con_handlerLukas Larsson
2016-08-04ssh: update version numberHans Nilsson
2016-08-04Merge branch 'ellbee/odbc/configure-OS-X-El-Capitan/PR-1137/OTP-13781' into ↵Raimo Niskanen
maint * ellbee/odbc/configure-OS-X-El-Capitan/PR-1137/OTP-13781: Make ODBC configure handle OS X El Capitan
2016-08-03Fix segfault in crypto by increasing algo_cipher arrayDuncaen
2016-08-02Merge branch 'efine/inets/validate-inet6fb4/ERL-200/PR-1132/OTP-13776' into ↵Raimo Niskanen
maint * efine/inets/validate-inet6fb4/ERL-200/PR-1132/OTP-13776: Test inet6fb4 in basic suite Actually verify result of testcase Fix inets_sup_SUITE for local tests Add test for inet6fb4 validation Fix httpd_conf:validate_properties/1 for ipfamily
2016-08-01Merge branch 'comtihon/fprof/fix-gc-tags/PR-1136/OTP-13778' into maintBjörn-Egil Dahlberg
* comtihon/fprof/fix-gc-tags/PR-1136/OTP-13778: fix gc_start\end bug
2016-08-01Merge branch 'raimo/erts/prim_inet-unknown-address-families/OTP-13775' into ↵Raimo Niskanen
maint * raimo/erts/prim_inet-unknown-address-families/OTP-13775: Handle AF_UNSPEC and AF_UNDEFINED correctly
2016-08-01Merge branch 'raimo/SCTP-socket-stats/ERL-102/OTP-13773' into maintRaimo Niskanen
* raimo/SCTP-socket-stats/ERL-102/OTP-13773: Fix SCTP send stats in inet_drv Test inet:getstat/1 dead for SCTP send Fix test suite compilation warnings
2016-08-01Test inet6fb4 in basic suiteRaimo Niskanen
2016-07-29Make ODBC configure handle OS X El CapitanLee Bannard
Change ODBC configure.in script to recognize OS X El Capitan (Darwin v15.x)
2016-07-29Actually verify result of testcaseRaimo Niskanen
2016-07-29Fix inets_sup_SUITE for local testsRaimo Niskanen
2016-07-29Merge branch 'margnus1/erts/fix-hipe-literal-gc/PR-1122/OTP-13777' into maintBjörn-Egil Dahlberg
* margnus1/erts/fix-hipe-literal-gc/PR-1122/OTP-13777: check_process_code: Sweep HiPE stack for literals
2016-07-29fix gc_start\end bugTihon
2016-07-29Handle AF_UNSPEC and AF_UNDEFINED correctlyRaimo Niskanen
2016-07-28Add test for inet6fb4 validationEdwin Fine
2016-07-28Fix SCTP send stats in inet_drvRaimo Niskanen
2016-07-28Test inet:getstat/1 dead for SCTP sendRaimo Niskanen
2016-07-28Fix test suite compilation warningsRaimo Niskanen
2016-07-27Merge branch 'egil/erts/fix-distribution-test' into maintBjörn-Egil Dahlberg
* egil/erts/fix-distribution-test: erts: Fix epmd_module testcase erts: Fix whitespaces in distribution_SUITE
2016-07-26erts: Fix epmd_module testcaseBjörn-Egil Dahlberg
Regression from OTP-13770 (84549af1c996657aedee1263afec28b21bfa42a4)
2016-07-26Improve format_warning/1 specBrujo Benavides
Let it handle `dial_warning()` input as well, to match what `format_warning/2` expects.
2016-07-26erts: Fix whitespaces in distribution_SUITEBjörn-Egil Dahlberg
2016-07-26Merge branch 'okumin/kernel/remove-duplicated-line/PR-1119/OTP-13771' into maintBjörn-Egil Dahlberg
* okumin/kernel/remove-duplicated-line/PR-1119/OTP-13771: Remove a duplicated pattern matching in erl_epmd.erl
2016-07-26Merge branch 'lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770' into ↵Björn-Egil Dahlberg
maint * lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770: Respect -proto_dist switch while connection to EPMD
2016-07-25Merge branch 'maint-18' into maintRaimo Niskanen
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/common_test/doc/src/notes.xml lib/common_test/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk lib/stdlib/test/ets_SUITE.erl otp_versions.table
2016-07-25Merge branch 'vladdu/use-top-level-readme/ERL-180/PR-1120/OTP-13767' into maintBjörn-Egil Dahlberg
* vladdu/use-top-level-readme/ERL-180/PR-1120/OTP-13767: use top-level README in packaged release
2016-07-24Fix httpd_conf:validate_properties/1 for ipfamilyEdwin Fine
inets:start/2 fails when using the legacy option inet6fb4 with a configuration proplist. It is not translated to inet as documented. This breaks existing code that relies on the documented behavior. This commit fixes the issue by translating inet6fb4 everywhere it is encountered in httpd_conf:validate_properties/1. From inets documentation (http://erlang.org/doc/man/httpd.html): {ipfamily, inet | inet6} Default is inet, legacy option inet6fb4 no longer makes sense and will be translated to inet. Fixes ERL-200.
2016-07-23Updated OTP versionOTP-18.3.4.2Erlang/OTP
2016-07-23Prepare releaseErlang/OTP
2016-07-23Merge branch 'raimo/ssl/version-selection/maint-18/OTP-13753' into maint-18Erlang/OTP
* raimo/ssl/version-selection/maint-18/OTP-13753: Improve version selection
2016-07-23Merge branch 'peppe/ct_telnet_duplicated_lines/OTP-13730' into maint-18Erlang/OTP
* peppe/ct_telnet_duplicated_lines/OTP-13730: Fix error with duplicated printouts by ct_telnet:expect/3
2016-07-23Merge branch 'sverker/update_counter-deadlock/ERL-188/OTP-13731' into maint-18Erlang/OTP
* sverker/update_counter-deadlock/ERL-188/OTP-13731: erts: Add test ets_SUITE:update_counter_table_growth erts: Fix deadlock in ets:update_counter/4 erts: Optimize db_finalize_dbterm_hash
2016-07-23Fix error with duplicated printouts by ct_telnet:expect/3Peter Andersson
OTP-13730
2016-07-22Merge branch 'egil/erts/fix-maps-hashing/ERL-199/OTP-13763' into maintBjörn-Egil Dahlberg
* egil/erts/fix-maps-hashing/ERL-199/OTP-13763: erts: Update maps entropy tests erts: Fix internal hashing entropy for maps erts: Fix whitespaces
2016-07-21Merge branch ↵Björn-Egil Dahlberg
'imrivera/kernel/fix-code_server-crash/ERL-194/PR-1128/OTP-13765' into maint * imrivera/kernel/fix-code_server-crash/ERL-194/PR-1128/OTP-13765: Fix code_server crash when adding some code paths ERL-194
2016-07-21erts: Update maps entropy testsBjörn-Egil Dahlberg
2016-07-21erts: Fix internal hashing entropy for mapsBjörn-Egil Dahlberg
We need to use an initial hash seed for each map pair, i.e. the hash value. The hash value is reset to the seed for each pair instead of setting the seed to zero. If we don't, no additional entropy is given to the system and the hash collision resolution in maps:from_list/1 would fail.
2016-07-21erts: Fix whitespacesBjörn-Egil Dahlberg
2016-07-21Improve version selectionRaimo Niskanen
Use the list of versions that the server allows and among those choose the highest version that is not higher than the client's version. Note that this chosen version might be lower than the client's version, but is used to improve interoperability. Patch suggested by Dimitry Borisov refering to RFC 5246 appendix E.1.