aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-08-07ssl: Setopts during renegotiation caused the renegotiation to be unsuccessful.Ingela Anderton Andin
If calling setopts during a renegotiation the FSM state might change during the handling of the setopts messages, this is now handled correctly.
2013-08-07Merge branch 'weisslj/fix-gcc40-arm-compile-error/OTP-11214' into maintFredrik Gustafsson
* weisslj/fix-gcc40-arm-compile-error/OTP-11214: Fix compile error on ARM and GCC < 4.1.0
2013-08-07Merge branch 'fredrik/xmerl/fix_doc/OTP-11224' into maintFredrik Gustafsson
* fredrik/xmerl/fix_doc/OTP-11224: xmerl: fix typos
2013-08-07Merge remote branch 'origin/peppe/common_test/ct_log_updates' into maintPeter Andersson
* origin/peppe/common_test/ct_log_updates: Make the CT logger print to stdout if test_server is not running Add test Allow calls to ct:pal and ct:print even if CT is not running OTP-11176
2013-08-06xmerl: fix typosFredrik Gustafsson
2013-08-05Merge branch 'fredrik/inet/clarify_doc_address/OTP-10676' into maintFredrik Gustafsson
* fredrik/inet/clarify_doc_address/OTP-10676: kernel: fixed specs to inet:ntoa/1 kernel: changed tests where inet_parse:ntoa/1 was used to inet:parse/1 kernel: added ntoa documentation and exported it in inet.erl kernel: clarified inet:parse_address/1 referrering to old code
2013-08-05Merge branch 'weisslj/fix-abcast-comment-typo/OTP-11219' into maintFredrik Gustafsson
* weisslj/fix-abcast-comment-typo/OTP-11219: Fix typo in abcast() function comment
2013-08-01Fix typo in abcast() function commentJohannes Weißl
2013-08-01Merge branch 'pan/erlang_halt_2_wrong_flush_default/OTP-11218' into maintPatrik Nyblom
* pan/erlang_halt_2_wrong_flush_default/OTP-11218: Change default of erlang:halt/2 to the documented
2013-08-01Merge branch 'mmalecki/fix-solaris/OTP-11213' into maintFredrik Gustafsson
* mmalecki/fix-solaris/OTP-11213: Fix compilation on Solaris
2013-07-31Merge branch 'anders/diameter/UTF8String_encode/OTP-11172' into maintAnders Svensson
* anders/diameter/UTF8String_encode/OTP-11172: Simplify Address encode/decode Use module unicode for UTF8String encode/decode Fix UTF8String encode
2013-07-30Simplify Address encode/decodeAnders Svensson
By using binary comprehensions. Add string-valued addresses to codec suite.
2013-07-30Use module unicode for UTF8String encode/decodeAnders Svensson
The original code predates that module but there's no reason not to use it now.
2013-07-30Fix UTF8String encodeAnders Svensson
To accept any nested list of codepoints and binaries. A list containing a binary was previously misinterpreted and the documentation was incomplete. Also, rework codec suite slightly to be able to specify values for which decode o encode is the identity map, for which encode should succeed, and for which encode should fail.
2013-07-30kernel: fixed specs to inet:ntoa/1Fredrik Gustafsson
2013-07-30kernel: changed tests where inet_parse:ntoa/1 was used to inet:parse/1Fredrik Gustafsson
2013-07-30kernel: added ntoa documentation and exported it in inet.erlFredrik Gustafsson
2013-07-30kernel: clarified inet:parse_address/1 referrering to old codeFredrik Gustafsson
2013-07-30Change default of erlang:halt/2 to the documentedPatrik Nyblom
Bug reported by Jose Valim on the erlang-bugs mailing list: erlang:halt(0,[]) does not flush as advertised in the documentation. Should be the same as erlang:halt(0,[{flush,true}]), but is in fact the same as erlang:halt(0,[{flush,false}]).
2013-07-30Merge branch 'weisslj/fix-inets-doc-errors/OTP-11210' into maintFredrik Gustafsson
* weisslj/fix-inets-doc-errors/OTP-11210: Fix some errors in the inets documentation
2013-07-30Merge branch 'nox/eunit-macros-blocks' into maintFredrik Gustafsson
* nox/eunit-macros-blocks: Wrap eunit macros into begin ... end blocks
2013-07-29Merge branch 'weisslj/run-erl-redirect-dev-null/OTP-11215' into maintFredrik Gustafsson
* weisslj/run-erl-redirect-dev-null/OTP-11215: run_erl: Redirect standard streams to /dev/null
2013-07-29Merge branch 'nox/fix-comp-warnings/OTP-11212' into maintFredrik Gustafsson
* nox/fix-comp-warnings/OTP-11212: Bootstrap Silence a misleading warning with some comprehensions
2013-07-29Merge branch 'nox/fix-fname-inlining/OTP-11211' into maintFredrik Gustafsson
* nox/fix-fname-inlining/OTP-11211: Added primary bootstrap Restrict inlining of local fun references
2013-07-26Fix compilation on SolarisMaciej Małecki
Trying to compile R16B01 on SmartOS resulted in following errors: gcc -c -o ../priv/obj/i386-pc-solaris2.11/ferrule.o -Werror=return-type -g -O2 -I/root/otp_src_R16B01/erts/i386-pc-solaris2.11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-tree-copyrename -DHAVE_CONFIG_H ferrule.c ferrule.c:53:1: error: return type defaults to 'int' [-Werror=return-type] ... gcc -c -o ../priv/obj/i386-pc-solaris2.11/mod_syslog.o -Werror=return-type -g -O2 -I/root/otp_src_R16B01/erts/i386-pc-solaris2.11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-tree-copyrename -DHAVE_CONFIG_H mod_syslog.c mod_syslog.c:50:1: error: return type defaults to 'int' [-Werror=return-type] mod_syslog.c: In function 'make_exit': mod_syslog.c:136:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default] mod_syslog.c: In function 'main': mod_syslog.c:131:1: error: control reaches end of non-void function [-Werror=return-type] Adding return values and types to `main` functions in `mod_syslog.c` and `ferrule.c` fixed the build.
2013-07-24Merge branch 'sb/fix-alignment-q-command/OTP-11209' into maintBjörn-Egil Dahlberg
* sb/fix-alignment-q-command/OTP-11209: Fix indentation of User switch command help in Erlang shell
2013-07-24Merge branch 'jv/update-io_prompt-type/OTP-11208' into maintBjörn-Egil Dahlberg
* jv/update-io_prompt-type/OTP-11208: Update io:prompt() type
2013-07-24Merge branch 'jv/filelib-types/OTP-11208' into maintBjörn-Egil Dahlberg
* jv/filelib-types/OTP-11208: Update filelib.erl typespecs
2013-07-24Fix some errors in the inets documentationJohannes Weißl
2013-07-23Merge branch 'anders/diameter/inappropriate_DWR/OTP-11184' into maintAnders Svensson
* anders/diameter/inappropriate_DWR/OTP-11184: Ensure DWR isn't sent immediately after DWA Comment tweaks
2013-07-22Merge branch 'egil/os_mon/fix-bsd-disksup/OTP-11207' into maintBjörn-Egil Dahlberg
* egil/os_mon/fix-bsd-disksup/OTP-11207: os_mon: Fix openbsd diskspace queries os_mon: Fix freebsd diskspace queries
2013-07-22Merge branch 'egil/test-cuddling' into maintBjörn-Egil Dahlberg
2013-07-22Merge branch 'sze/to_erl/OTP-11206' into maintBjörn-Egil Dahlberg
* sze/to_erl/OTP-11206: Fix changing terminal parameters in to_erl
2013-07-22Fix changing terminal parameters in to_erlStefan Zegenhagen
One of our devices does not like 'to_erl' to be run over a serial port. When to_erl is started, we see "Attaching to /tm<0xFF>" being printed and the device then refuses to accept any input. Occasionally, we have seen a linux kernel error message "serial8250: too much work for irq16" simultaneously. After some debugging we found out that cause is a call to tcsetattr() by to_erl, immediately preceeded by some printf(). The UART in our device doesn't like hardware parameters to be changed while output is concurrently active. In fact, the GNU libc manual also mentions that it might be dangerous to change UART hardware parameters when a transmission is ongoing. The patch attached to this e-mail changes the behaviour of to_erl to use TCSADRAIN instead of TCSANOW when changing terminal parameters. This makes the serial driver wait for the output queues to be empty before applying the terminal parameter change.
2013-07-21Update filelib.erl typespecsJosé Valim
Most functions in filelib support binaries as arguments but that was not reflected in the typespecs. The types filename_all() and dirname_all() were introduced to mimic file:name_all().
2013-07-21Update io:prompt() typeJosé Valim
Functions that expect an io:prompt() also accept binaries and iolists as arguments. Therefore its type has been updated to reflect the same types accepted by other io functions.
2013-07-21Fix indentation of User switch command help in Erlang shellsyl20bnr
2013-07-19os_mon: Relax disksup_SUITE test even moreBjörn-Egil Dahlberg
Capacity can be zero on certain filesystems. Remove reported mountpoints with zero capacity during tests since these reports false positives.
2013-07-18os_mon: Fix openbsd diskspace queriesBjörn-Egil Dahlberg
Use 'df -k -l' to query OpenBSD about diskspace on local disks. Same reasoning as for FreeBSD - additional filesystems without listing them all.
2013-07-18os_mon: Fix freebsd diskspace queriesBjörn-Egil Dahlberg
Use 'df -k -l' to query FreeBSD about diskspace on local disks. Previously 'df' -k -t ufs' was used but this will not handle zfs disks. Just use '-l' instead of listing potential filesystems.
2013-07-18os_mon: Refactor disksup_SUITEBjörn-Egil Dahlberg
Notably, remove ?line macro.
2013-07-18os_mon: Relax disksup_SUITE api testBjörn-Egil Dahlberg
2013-07-18Fix compile error on ARM and GCC < 4.1.0Johannes Weißl
Since b29ecbd (OTP-10418, R15B03) Erlang does not compile anymore with old versions of GCC that do not have atomic ops builtins on platforms where there is no native ethread implementation (e.g. ARM): In file included from ../include/internal/gcc/ethread.h:29, from ../include/internal/ethread.h:354, from beam/erl_threads.h:264, from beam/erl_smp.h:27, from beam/sys.h:413, from hipe/hipe_mkliterals.c:29: ../include/internal/gcc/ethr_membar.h:49:4: error: #error "No __sync_val_compare_and_swap" This patch adds a header guard in "gcc/ethread.h", as is present in "libatomic_ops/ethread.h".
2013-07-16snmp: Silence debug in testsBjörn-Egil Dahlberg
2013-07-15tests: Relax system_profile_SUITE scheduler testBjörn-Egil Dahlberg
2013-07-15tests: Refactor away ?line macroBjörn-Egil Dahlberg
2013-07-15tests: Relax receive_SUITE time constraintBjörn-Egil Dahlberg
2013-07-15Merge branch 'egil/erts/aggregate-system-traceability/OTP-11196' into maintBjörn-Egil Dahlberg
* egil/erts/aggregate-system-traceability/OTP-11196: Check for native code without loading module Fix erlang:system_info(compile_info) Fix system_information get_beam_name/0 Add beam dynamic libraries to system_information Add system_information testsuite Add system information aggregate Refactor away ?line macro in code_SUITE Fix tests for erts app-file Add erts app-file erts: Add cflags, ldflags and config.h into executable
2013-07-15Check for native code without loading moduleBjörn-Egil Dahlberg
2013-07-15Fix erlang:system_info(compile_info)Björn-Egil Dahlberg
Allocation needs to be in correct order.