aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-10-30Merge branch 'ia/ssh/pty-request/OTP-11542' into maintIngela Anderton Andin
* ia/ssh/pty-request/OTP-11542: ssh: Add basic ptty_alloc tests ssh: Add pty_alloc request to ssh:shell/[1,2,3] ssh: Add ptty_alloc/[2,3]
2014-10-30ssh: Correct typo of renegotiate that could cause rekeying to failIngela Anderton Andin
2014-10-30Merge branch 'ollema/wx_object-emacs-skeleton' into maintMarcus Arendt
* ollema/wx_object-emacs-skeleton: Add wx_object as emacs skeleton
2014-10-30erts: Mend run_erl to set windows size of terminal sent from to_erlSverker Eriksson
Need to include sys/ioctl.h for TIOCSWINSZ to be defined. Seems this was broken when refactoring run_erl for OSE in OTP 17.0.
2014-10-30Merge branch 'hans/eldap/extensible_match_filter/OTP-12174' into maintHans Nilsson
* hans/eldap/extensible_match_filter/OTP-12174: eldap: vsn.mk updated. eldap: extensibleMatch added.
2014-10-30eldap: vsn.mk updated.Hans Nilsson
2014-10-30eldap: extensibleMatch added.Hans Nilsson
2014-10-29Merge branch 'sverk/etp-check-beam-ranges' into maintSverker Eriksson
* sverk/etp-check-beam-ranges: erts: Add gdb command etp-check-beam-ranges
2014-10-29erts: Add gdb command etp-check-beam-rangesSverker Eriksson
2014-10-29erts: Fix bug in beam_rangesSverker Eriksson
Symptom: VM on OSX (darwin11.4.2) with +Meamin running sasl tests, crashing when init:reboot() does erlang:purge_module(installer). Problem: Off-by-one bug in beam_ranges:find_range, returning the wrong range if the 'end' of one module is the 'start' of the next. This is only possible if using sys_alloc (+Meamin) as our own allocators always put block headers between allocated payload data.
2014-10-29ssh: Add basic ptty_alloc testsIngela Anderton Andin
2014-10-28Merge branch 'sverk/cpool_fetch-dc_list-bug/OTP-12249' into maintSverker Eriksson
* sverk/cpool_fetch-dc_list-bug/OTP-12249: erts: Fix bug when delayed deallocated carrier is reused by cpool_fetch
2014-10-28Fix a typo in the mnesia documentationSina Samavati
2014-10-28Merge branch 'lukas/erts/win32-read_file_info-links/OTP-12269' into maintLukas Larsson
* lukas/erts/win32-read_file_info-links/OTP-12269: erts: Initialize links when reading file info
2014-10-28Merge branch 'sv/isfinite/OTP-12268' into maintLukas Larsson
* sv/isfinite/OTP-12268: Use isfinite() instead of finite() when available
2014-10-28Use isfinite() instead of finite() when availableAnthony Ramine
OS X Mavericks builds result in a number of warnings about finite() being deprecated, like these: beam/erl_arith.c:451:7: warning: 'finite' is deprecated: first deprecated in OS X 10.9 [-Wdeprecated-declarations] ERTS_FP_ERROR(p, f1.fd, goto badarith); ^ sys/unix/erl_unix_sys.h:319:33: note: expanded from macro 'ERTS_FP_ERROR' ^ sys/unix/erl_unix_sys.h:244:51: note: expanded from macro '__ERTS_FP_ERROR' ^ /usr/include/math.h:718:12: note: 'finite' has been explicitly marked deprecated here extern int finite(double) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_9, __IPHONE_NA, __IPHONE_NA); Add checks to use isfinite() instead of finite() where available. Verified on OS X Mavericks 10.9.5 and Ubuntu 12.04.
2014-10-28Merge branch 'pguyot/fix-freebsd-cpu-topology' into maintBruce Yinhe
OTP-12267 * pguyot/fix-freebsd-cpu-topology: Fix bug in FreeBSD topology detection code
2014-10-28Merge branch 'vinoski/erl-nif-init' into maintBruce Yinhe
OTP-12266 * vinoski/erl-nif-init: Fix missing field initializer in ERL_NIF_INIT macro
2014-10-27Merge branch 'egil/maps/syntax-tools/OTP-12265' into maintBjörn-Egil Dahlberg
* egil/maps/syntax-tools/OTP-12265: syntax_tools: Strengthen igor tests syntax_tools: Strengthen erl_recomment tests syntax_tools: Strengthen erl_syntax comments tests syntax_tools: Teach Maps to erl_syntax syntax_tools: Fix is_literal/1 for binary syntax_tools: Strengthen epp_dodger tests syntax_tools: Strengthen erl_syntax tests syntax_tools: Refactor away ?line macro
2014-10-27Fix miscompilation when module contains multiple named funsAnthony Ramine
A module containing two named funs bearing the same name and arity could be miscompiled. Reported-by: Sam Chapin
2014-10-27Merge branch 'knewter/bugfix/typo_in_wx_demo' into maintMarcus Arendt
* knewter/bugfix/typo_in_wx_demo: wx: Fix typo in graphicsContext example
2014-10-27Merge branch 'vinoski/darwin-vsn-odbc' into maintMarcus Arendt
* vinoski/darwin-vsn-odbc: Make ODBC configure handle OS X Mavericks and Yosemite
2014-10-26Fix "-smp disable" for emulator with dirty schedulersSteve Vinoski
Running "erl -smp disable" on an emulator built with dirty scheduler support caused problems such as segmentation violations and emulator status line outputs containing garbage. For example: $ erl -smp disable Segmentation fault (core dumped) and: $ erl -smp disable Erlang/OTP 17 [DEVELOPMENT] [erts-6.2] [source] [64-bit] [ds:10:4297895689:4299948152] [async-threads:280] This problem also caused the emulator smoke_test_SUITE to hit these same problems if run in an emulator started with the "-smp disable" option. Fix this segmentation violation by ensuring that dirty scheduler information is printed in the status line only when the emulator is compiled with ERTS_SMP enabled. With this fix in place, the smoke_test_SUITE now passes when the "-smp disable" option is used, and the emulator status line prints correctly for both "-smp enable" and "-smp disable": $ erl -smp enable Erlang/OTP 17 [DEVELOPMENT] [erts-6.2] [source] [64-bit] [smp:8:8] [ds:8:8:10] [async-threads:10] [kernel-poll:false] and: $ erl -smp disable Erlang/OTP 17 [DEVELOPMENT] [erts-6.2] [source] [64-bit] [async-threads:10] [kernel-poll:false]
2014-10-24Fix ssh_sftp:start_channel timeoutSimon Cornish
The {timeout, Timeout} option passed to ssh_sftp:start_channel is not applied to the early phases of the SSH protocol. For example, if the remote server fails to respond after the "hello" then the call will hang for as long as the server keeps the TCP connection alive. This patch passes the Timeout through to ssh:connect. In case the timeout occurs during these phases, {error, timeout} is returned.
2014-10-24syntax_tools: Strengthen igor testsBjörn-Egil Dahlberg
Simple test of igor:merge/3
2014-10-24syntax_tools: Strengthen erl_recomment testsBjörn-Egil Dahlberg
Also erl_comment_scan tests.
2014-10-24syntax_tools: Strengthen erl_syntax comments testsBjörn-Egil Dahlberg
Comments in the syntax tree. Tested via t_epp_dodger.
2014-10-24syntax_tools: Teach Maps to erl_syntaxBjörn-Egil Dahlberg
Affected functions: * erl_syntax:abstract/1 * erl_syntax:concrete/1 * erl_syntax:is_leaf/1 * erl_syntax:is_literal/1
2014-10-24syntax_tools: Fix is_literal/1 for binaryBjörn-Egil Dahlberg
2014-10-24Merge branch 'sverk/hipe-wrap-bif-disable-gc-fixes/OTP-12231' into maintSverker Eriksson
* sverk/hipe-wrap-bif-disable-gc-fixes/OTP-12231: erts: Fix bug when hipe tailcalls trapping BIF that disables GC erts: Fix hipe bug when gc-disabling bif traps with gc enabled
2014-10-23syntax_tools: Strengthen epp_dodger testsBjörn-Egil Dahlberg
Mostly epp_dodger smoke tests.
2014-10-23syntax_tools: Strengthen erl_syntax testsBjörn-Egil Dahlberg
Mostly type and conversion tests.
2014-10-23Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION
2014-10-23Updated OTP versionOTP-17.3.3Erlang/OTP
2014-10-23Update release notesErlang/OTP
2014-10-23Merge branch 'hans/ssh/scanning/OTP-12247' into maint-17Erlang/OTP
* hans/ssh/scanning/OTP-12247: ssh: fix ssh.appup.src. ssh: Corrected appup ssh: fix .app and .appup errors ssh: remove supervisors for crashed connection worker ssh: Print supervisor tree (on demand). ssh: prepare for release ssh: avoid terminated but not deleted children to be counted. ssh: simple info function (ssh_info:print/0). ssh: Gracefully handle bad handshake messages ssh: reduce amount of printouts ssh: Fix port scanner problems
2014-10-23Merge branch 'rickard/maint-17/eager-check-io/OTP-12117' into maintRickard Green
* rickard/maint-17/eager-check-io/OTP-12117: No eager check I/O on OSE Introduce support for eager check I/O scheduling
2014-10-23ssh: fix ssh.appup.src.Hans Nilsson
2014-10-23ssh: Corrected appupIngela Anderton Andin
2014-10-23Merge branch 'hb/stdlib/fix_dets_test' into maintHans Bolinder
* hb/stdlib/fix_dets_test: Fix rare race condition in Dets
2014-10-23Fix rare race condition in DetsHans Bolinder
The correction is due to the the evil testcase dets_SUITE:simultaneous_open(). If the process repairing a Dets file is killed (should normally never happen), and another process tries to repair the file, a temporary file from the first process could live on for a while, even after a successful call to file:delete(). This has only been seen on W-nd-ows, where it is a known problem. There are other ways to deal with the problem (rename the file; use some other filename), but we continue using one certain filename in order to be as backwards compatible as possible.
2014-10-23Merge branch 'hb/debugger/ct_line_cleanup' into maintHans Bolinder
* hb/debugger/ct_line_cleanup: debugger: clean up Common Test adaption
2014-10-22ssh: fix .app and .appup errorsHans Nilsson
2014-10-22ssh: remove supervisors for crashed connection workerHans Nilsson
2014-10-22ssh: Print supervisor tree (on demand).Hans Nilsson
2014-10-22Merge branch 'vinoski/crashdump-sigusr1' into maintBruce Yinhe
* vinoski/crashdump-sigusr1: Clarify the use of SIGUSR1 for forcing crash dumps
2014-10-22Merge branch 'vinoski/clarify-drv-async-return' into maintBruce Yinhe
* vinoski/clarify-drv-async-return: Clarify docs for driver_async() return value
2014-10-22Merge branch 'HansN/prop_test_updates' into maintBruce Yinhe
OTP-12256 * HansN/prop_test_updates: Optimizations ssh_eqc_encode_decode.erl compiles Add timeout to a property test (Thanks John & Tobias @ QuviQ) Reduce the total testing time for the properties to 20 seconds No side effects in function arguments Passing global var to QuickCheck statemachine
2014-10-22Merge branch 'vinsentru/inets_ftp_extension' into maintBruce Yinhe
OTP-12255 * vinsentru/inets_ftp_extension: INETS FTP: EPSV and EPRT for IPv4 added
2014-10-22syntax_tools: Refactor away ?line macroBjörn-Egil Dahlberg