aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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
2014-10-22Make sure code links are generated even if undefined macros existPeter Andersson
OTP-11766
2014-10-22ssh: Add pty_alloc request to ssh:shell/[1,2,3]Ingela Anderton Andin
2014-10-22ssh: Add ptty_alloc/[2,3]Ingela Anderton Andin
2014-10-22Merge branch 'qrilka/patch-2/typo-fix' into maintMarcus Arendt
* qrilka/patch-2/typo-fix: Minor misprints correction
2014-10-21ssh: prepare for releaseHans Nilsson
2014-10-21ssh: avoid terminated but not deleted children to be counted.Hans Nilsson
2014-10-21erts: Fix bug when hipe tailcalls trapping BIF that disables GCSverker Eriksson
Symptom: base64_SUITE:roundtrip crashes with hipe compiled stdlib. Problem: HIPE_WRAPPER_BIF_DISABLE_GC pushed a "trap frame", but the frame was only popped if the call was recursive. Solution: Only reserve "trap frame" if BIF call is recursive.
2014-10-21erts: Fix hipe bug when gc-disabling bif traps with gc enabledSverker Eriksson
The trap_frame got pushed twice, first by the wrapper then by hipe_push_beam_trap_frame as it was looking at F_DISABLE_GC.
2014-10-21ssh: simple info function (ssh_info:print/0).Hans Nilsson
2014-10-21Merge branch 'peppe/common_test/crash_during_close' into maintPeter Andersson
* peppe/common_test/crash_during_close: Solve memory consumption problem Fix problem with buffered async io messages executed too late Don't generate weird exit if ct_logs has terminated before shut down OTP-12159
2014-10-21debugger: clean up Common Test adaptionHans Bolinder
The ct_line module was removed some releases ago.
2014-10-21Prepare releaseErlang/OTP
2014-10-21Merge branch 'rickard/eager-check-io/OTP-12117' into maint-r16Erlang/OTP
* rickard/eager-check-io/OTP-12117: Introduce support for eager check I/O scheduling
2014-10-20erts: Fix bug causing mbc to be deleted from cpool before it was insertedSverker Eriksson
Set IN_POOL flag _after_ mbc has been actually inserted. Earlier it did not matter if IN_POOL was set early as it was not possible to find a carrier before is was fully inserted. Now when searching pooled_list and traitor_list we must make sure a found carrier has been fully inserted into cpool before removing it.
2014-10-20Merge branch 'bjorn/asn1/primitive-indefinite-length/OTP-12205' into maintBjörn Gustavsson
* bjorn/asn1/primitive-indefinite-length/OTP-12205: BER decoding: Don't allow primitives with indefinite lengths
2014-10-20Merge branch 'adelzhang/fix_application_master_comment' into maintBruce Yinhe
* adelzhang/fix_application_master_comment: Fix obsolete comment
2014-10-19Fix bug in FreeBSD topology detection codePaul Guyot
Code incorrectly relied on undefined C behavior. Clang and gcc 4.9 do not behave as code expected. This affected cores and processors detection on FreeBSD.
2014-10-17wx: Fix typo in graphicsContext exampleJosh Adams
2014-10-17Clarify the use of SIGUSR1 for forcing crash dumpsSteve Vinoski
The crash_dump document mentions indirectly that delivering a SIGUSR1 to a running emulator process can force it to crash dump. Clarify that text to make it clear SIGUSR1 can be used for that purpose, and also add a similar note about using SIGUSR1 to the erl documentation.
2014-10-17Clarify docs for driver_async() return valueSteve Vinoski
The documentation for driver_async() still referred to the return value of the function as a "handle", which is no longer meaningful since driver_async_cancel() was deprecated and removed. Modify the documentation to simply indicate that the driver_async() return value will be -1 if it fails.
2014-10-17Optimize atomic ops with release barrier for 32-bit PowerPCRickard Green
2014-10-17Solve memory consumption problemPeter Andersson
2014-10-17ssh: Gracefully handle bad handshake messagesIngela Anderton Andin