aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-07-24Fix line counting in token and tokens functionsarchimed
The line counter becomes invalid, when the rules with linewrap are used. This issue appears, because the parsing FSM does not rollback the line counter after attempting such rule. Unit tests for 'token' and 'tokens' are also added.
2014-07-24Add unit test for string fun in leex test suitearchimed
2014-07-24Fix the line counting in string functionarchimed
The line counter becomes invalid, when the rules with linewrap are used. This issue appears, because the parsing FSM does not rollback the line counter after attempting such rule.
2014-07-11Merge branch 'maint-17' into maintErland Schönbeck
2014-07-10Merge branch 'siri/alarm_handler-doc/OTP-12025' into maintSiri Hansen
* siri/alarm_handler-doc/OTP-12025: Fix bug in alarm_handler documentation
2014-07-10Fix bug in alarm_handler documentationSiri Hansen
The documentation erroneously specified that clear_alarm/1 would clear *all* alarms with id AlarmId. This is now corrected according to the implementation - only the latest received alarm with the given AlarmId is cleared.
2014-07-10Merge branch 'siri/sys-FormFunc-spec/OTP-11800' into maintSiri Hansen
* siri/sys-FormFunc-spec/OTP-11800: Fix spec of format function in sys
2014-07-10Updated OTP versionOTP-17.1.2Erlang/OTP
2014-07-10Prepare releaseErlang/OTP
2014-07-10Merge branch 'nox/filelib-wildcard-broken-link' into maint-17Erlang/OTP
* nox/filelib-wildcard-broken-link: Update stdlib appup file Update runtime dependencies Update preloaded Add tests of filelib and symlinks Fix handling of broken symlinks in filelib Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2014-07-10Update stdlib appup fileSiri Hansen
Allow upgrade from OTP 17.1 to newer.
2014-07-09Update runtime dependenciesSiri Hansen
2014-07-09Update preloadedSiri Hansen
2014-07-09Add tests of filelib and symlinksSiri Hansen
This commit complements 769996c0cd4cb68c157e39de725642f209ed7423 and adds tests for the following problems introduced by f11aabdc9fec593c31e6c4f3fa25c1707e9c35df: Given the symlink 'dirlink' pointing to an existing dir, then - filelib:is_regular("dirlink") -> false - filelib:is_dir("dirlink") -> false Given the symlink 'filelink' pointing to an existing file, then - filelib:is_regular("filelink") -> false - filelib:is_file("filelink") -> false - filelib:last_modified("filelink") and filelib:filesize("filelink") return the info of the link and not the file Given the symlink "broken_symlink" pointing to a non-existing file, then - filelib:wildcard("broken_symlink",File) -> []
2014-07-09Fix handling of broken symlinks in filelibAnthony Ramine
This fixes a bug introduced in f11aabdc9fec593c31e6c4f3fa25c1707e9c35df where filelib:eval_read_file_info/2 was made to use file:read_link_info/1 to never follow symlinks. This fixed wildcard/1 but broke every other function using eval_read_file_info/2. Reported-by: Louis-Philippe Gauthier Reported-by: Danil Zagoskin
2014-07-09Merge branch 'weisslj/disksup-posix-only' into maintBruce Yinhe
OTP-12053 * weisslj/disksup-posix-only: Add 'disksup_posix_only' parameter to disksup
2014-07-09Merge branch 'legoscia/patch-7' into maintBruce Yinhe
OTP-12052 * legoscia/patch-7: erlang:statistics(runtime) returns milliseconds
2014-07-09Merge branch 'lucafavatella/refactor-eunit-check_arity' into maintBruce Yinhe
OTP-12051 * lucafavatella/refactor-eunit-check_arity: Refactor function in eunit using is_function/2
2014-07-09Merge branch 'nox/fix-javadoc' into maintBruce Yinhe
OTP-12050 * nox/fix-javadoc: Fix a few javadoc errors
2014-07-09Merge branch 'vladdu/jinterface_stream_exceptions' into maintBruce Yinhe
OTP-12049 * vladdu/jinterface_stream_exceptions: jinterface: OtpInputStream exceptions show useless value
2014-07-07Merge branch 'dnet/parse_sni' into maintBruce Yinhe
* dnet/parse_sni: added SNI decode test to SSL handshake suite ssl: parse SNI in received client hello records OTP-12048
2014-07-07Merge branch 'nevar/patch-1' into maintHenrik Nord
* nevar/patch-1: Fix typo in Advanced chapter
2014-07-07Merge branch 'mururu/fix-typo' into maintBruce Yinhe
* mururu/fix-typo: Fix typo in erl_eval:exprs comments
2014-07-07Merge branch 'nox/io_lib_format-width-too-small' into maintBruce Yinhe
* nox/io_lib_format-width-too-small: Properly handle fields too short in io_lib_format OTP-12041
2014-07-04Fix typo in erl_eval:exprs commentsYuki Ito
2014-07-03Fix spec of format function in sysSiri Hansen
The argument FormFunc is sys:handle_debug/4war erronously specified as dbg_fun(), which is a debug function. This has now been corrected by adding a new type, format_fun().
2014-07-02erlang:statistics(runtime) returns millisecondsMagnus Henoch
Specify in the documentation that erlang:statistics(runtime) returns milliseconds.
2014-07-02Refactor function in eunit using is_function/2Luca Favatella
is_function/2 looks present since at least OTP R13B03, so the change shall not undermine running eunit on older versions of Erlang. This commit is only refactoring - it contains no functional changes.
2014-07-02Merge branch 'wmalik/processes-doc' into maintBruce Yinhe
* wmalik/processes-doc: rephrase sentence in process links doc
2014-07-02Merge branch 'maint-17' into maintMagnus Lidén
2014-07-01Updated OTP versionOTP-17.1.1Erlang/OTP
2014-07-01Prepare releaseErlang/OTP
2014-07-01Merge branch 'egil/fix-ethr-force-inline/OTP-12010' into maint-17Erlang/OTP
* egil/fix-ethr-force-inline/OTP-12010: vxworks: Fix SYSTEMD_DAEMON_LIBS in configure erts: Separate ethread inlining from ethread.h
2014-07-01Merge branch 'hb/edoc/latin1_fix/OTP-12008' into maint-17Erlang/OTP
* hb/edoc/latin1_fix/OTP-12008: edoc, syntax_tools: Don't fail on invalid UTF-8
2014-07-01Merge branch 'hb/stdlib/dets_insert_new/OTP-12024' into maintHans Bolinder
* hb/stdlib/dets_insert_new/OTP-12024: stdlib: Correct documentation of dets:insert/2
2014-07-01Add 'disksup_posix_only' parameter to disksupJohannes Weißl
On embedded (Linux) systems the "df" program is very often provided by the Busybox (or Toolbox) project. This version does not provide the "-l" option (for displaying only local filesystems) used in disksup.erl. To make disksup work on these embedded platforms, this patch adds a new application parameter 'disksup_posix_only', to make diskup use only options defined in the POSIX standard: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/df.html
2014-06-30vxworks: Fix SYSTEMD_DAEMON_LIBS in configureBjörn-Egil Dahlberg
2014-06-30erts: Separate ethread inlining from ethread.hBjörn-Egil Dahlberg
The commit adb5dc0090bc419e2c4c1250653badbddeb6263b (ETHR_FORCE_INLINE) broke some platforms without adequate thread support.
2014-06-30Merge branch 'hb/hipe/pretty_bitstring/OTP-12015' into maintHans Bolinder
* hb/hipe/pretty_bitstring/OTP-12015: hipe: Correct pretty-printing of bitstrings
2014-06-30stdlib: Correct documentation of dets:insert/2Hans Bolinder
Thanks to Alexei Sholik for reporting the bug.
2014-06-29rephrase sentence in process links docWasif Malik
2014-06-26hipe: Correct pretty-printing of bitstringsHans Bolinder
2014-06-26edoc, syntax_tools: Don't fail on invalid UTF-8Hans Bolinder
As a temporary measure to ease the transition to default UTF-8 encoding, automatically fall back to the Latin-1 encoding (without any warnings; the Erlang Compiler will emit a proper warning). The intention is to remove this workaround in OTP 18 or 19.
2014-06-26Merge branch 'ia/inets/reload-tests-and-timeout-mixup/OTP-12013' into maintIngela Anderton Andin
* ia/inets/reload-tests-and-timeout-mixup/OTP-12013: inets: Create seperate timeout for TLS/SSL handshake inets: Add reload tests
2014-06-26inets: Create seperate timeout for TLS/SSL handshakeIngela Anderton Andin
We do not want this timeout to be mixed up with the keep alive timeout. We will probably want to make it configurable later.
2014-06-26inets: Add reload testsIngela Anderton Andin
2014-06-20Fix typo in Advanced chapterSlava Yurin
2014-06-19Updated OTP versionOTP-17.1Erlang/OTP
2014-06-19Prepare releaseErlang/OTP
2014-06-19Merge branch 'sverk/crypto-ec-mem-leak/OTP-11999' into maintSverker Eriksson
* sverk/crypto-ec-mem-leak/OTP-11999: crypto: Fix memory leak of EC "keys" and "points" crypto: Fix crypto for debug and valgrind