aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2013-08-14Merge branch 'maint'Fredrik Gustafsson
2013-08-14Merge branch 'sg/odbcserver_crash_fix/OTP-11233' into maintFredrik Gustafsson
* sg/odbcserver_crash_fix/OTP-11233: Added a few input checks which prevent odbcserver crash if it's executed and supplied incorrect data to stdin. A crash example:
2013-08-12Merge branch 'maint'Siri Hansen
2013-08-12Merge branch 'siri/runtime_tools/dbg-silent/otp-11222' into maintSiri Hansen
* siri/runtime_tools/dbg-silent/otp-11222: Allow 'silent' flag to be set with dbg:p/2
2013-08-12Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-08-12Merge branch 'ia/ssl/header-bug/OTP-11230' into maintIngela Anderton Andin
* ia/ssl/header-bug/OTP-11230: ssl: Revert faulty header option fix
2013-08-08Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-08-08Merge branch 'ia/ssl/setopt-renegotiation-bug/OTP-11228' into maintIngela Anderton Andin
* ia/ssl/setopt-renegotiation-bug/OTP-11228: ssl: Setopts during renegotiation caused the renegotiation to be unsuccessful.
2013-08-08Merge branch 'maint'Lukas Larsson
* maint: stdlib: Include file:all datatypes in filelib
2013-08-08stdlib: Include file:all datatypes in filelibLukas Larsson
2013-08-08ssl: Revert faulty header option fixIngela Anderton Andin
The code was changed in the belife that it made it inet compatible. However the testing is a bit hairy as the inet option is acctualy broken, now the tests are corrected and the header option should work in the same broken way as inet again, preferably use the bitsyntax instead.
2013-08-08Merge branch 'maint'Lukas Larsson
* maint: Add smoke tests
2013-08-08Merge branch 'lukas/smoketests/OTP-11221' into maintLukas Larsson
* lukas/smoketests/OTP-11221: Add smoke tests
2013-08-08Merge branch 'maint'Fredrik Gustafsson
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-07fix: typo, inets/doc/src/httpdtomaon
2013-08-07Merge branch 'maint'Fredrik Gustafsson
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 branch 'maint'Peter Andersson
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-06Allow 'silent' flag to be set with dbg:p/2Siri Hansen
This flag, which silences call trace, can be set with erlang:trace/3, but was not allowed in dbg:p/2. This has been corrected.
2013-08-05Merge branch 'maint'Fredrik 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-05Add smoke testsLukas Larsson
Smoke tests are meant to verify that a build of erlang has been successfull.
2013-08-05Merge branch 'maint'Fredrik Gustafsson
2013-08-01Fix typo in abcast() function commentJohannes Weißl
2013-08-01Merge branch 'maint'Fredrik Gustafsson
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 'maint'Anders Svensson
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-30Merge branch 'maint'Fredrik Gustafsson
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 'maint'Fredrik Gustafsson
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 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/compiler/ebin/v3_core.beam
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 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/compiler/ebin/cerl_inline.beam
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 'maint'Björn-Egil Dahlberg
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 'maint'Björn-Egil Dahlberg