aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-12-06Merge branch 'egil/fix-dialyzer-specs/OTP-10601'Björn-Egil Dahlberg
* egil/fix-dialyzer-specs/OTP-10601: common_test: Fix exported types
2012-12-06Merge branch 'maint'Ingela Anderton Andin
Conflicts: erts/emulator/sys/vxworks/sys.c erts/vsn.mk lib/ssl/src/ssl_connection.erl lib/ssl/test/ssl_basic_SUITE.erl
2012-12-06Merge tag 'erl_1219' into maintOTP_R15B03-1Björn-Egil Dahlberg
erts: Patch 1219 OTP-10602 Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour changed). Don't create an erl_crash.dump if heart do exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour not changed). This changes the behaviour back to the R15B02 default considering if a beam was running with no heart.
2012-12-06Merge tag 'erl_1218' into maintBjörn-Egil Dahlberg
ssl: Patch 1218 OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored
2012-12-06Prepare releaseErlang/OTP
2012-12-06Merge branch 'egil/fix-crashdump-default/OTP-10602' into maint-r15Erlang/OTP
* egil/fix-crashdump-default/OTP-10602: erts: Change default of erl_crash.dump
2012-12-06Update release notesErlang/OTP
2012-12-06Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15Erlang/OTP
* egil/ia/ssl/accept-timeout/OTP-10600: ssl: Prepare for release ssl: Export sslsocket() dialyzer type ssl: Cancel non expired timers ssl: Fix recv after timeout expired ssl: Timeout handling changed so that the fsm-process will terminate if the ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires.
2012-12-06ssl: Prepare for releaseIngela Anderton Andin
2012-12-06ssl: Export sslsocket() dialyzer typeIngela Anderton Andin
2012-12-06ssl: Cancel non expired timersIngela Anderton Andin
2012-12-06ssl: Fix recv after timeout expiredIngela Anderton Andin
Reset state so that "recv data" is not sent as "active data" after a recv timed out and no new recv has been called.
2012-12-06ssl: Timeout handling changed so that the fsm-process will terminate if the ↵Ingela Anderton Andin
ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires. Add missing function clause to handle timeout during handshake. The missing clause had the effect that the timeout was wrongly discarded. Also add an extra test case for the recv timeout in addition to the one in ssl_packet_SUITE. The missing functions clause was introduced in 8a789189. This commit changed the timeout implementation, the previous implememtation could cause other type of problems as the timeout was client side.
2012-12-06Merge branch 'fredrik/ssh/doc-fun-logging/OTP-7792'Fredrik Gustafsson
* fredrik/ssh/doc-fun-logging/OTP-7792: Added documentation for failfun, connectfun and disconnectfun in ssh
2012-12-06Merge branch 'bjorn/remove-tuple-funs/OTP-10170'Björn Gustavsson
* bjorn/remove-tuple-funs/OTP-10170: erl_expand_records: Remove stale support for literal tuple funs Teach is_function/2 that tuples are not funs
2012-12-06Merge branch 'bjorn/compiler/minor-optimization-polishing/OTP-10193'Björn Gustavsson
* bjorn/compiler/minor-optimization-polishing/OTP-10193: beam_bsm: Improve handling of bs_start_match2 instructions beam_utils: Improve is_not_used/3 for bit syntax matching beam_bsm: Make the optimization applicable in more circumstances beam_jump: Move bs_context_to_binary/1 + exit instruction
2012-12-06Merge branch 'fredrik/eldap/fix-dialyzer-warnings-r16'Fredrik Gustafsson
* fredrik/eldap/fix-dialyzer-warnings-r16: Bumped version number Changed structure to fix dialyzer warnings eldap.erl
2012-12-06Bumped version numberFredrik Gustafsson
2012-12-05Merge branch 'sverk/bs_construct_SUITE-outofmem'Sverker Eriksson
* sverk/bs_construct_SUITE-outofmem: erts: Limit memory usage of bs_construct_SUITE:huge_binary
2012-12-05Merge branch 'sverk/crypto-openssl-0.9.7'Sverker Eriksson
* sverk/crypto-openssl-0.9.7: crypto: Skip sha256/512 tests for openssl 0.9.7 crypto: Refactor test with if_098 helper function crypto: Let info_lib return header version instead of lib version crypto: Make crypto:info() up to date crypto: Add some unlisted test cases as part of the test suite crypto: Fix some documentation bugs crypto: Throw notsup for DES3 CFB encryption for old openssl
2012-12-04crypto: Skip sha256/512 tests for openssl 0.9.7Sverker Eriksson
2012-12-04crypto: Refactor test with if_098 helper functionSverker Eriksson
2012-12-04crypto: Let info_lib return header version instead of lib versionSverker Eriksson
2012-12-04crypto: Make crypto:info() up to dateSverker Eriksson
Also added test code to check the consistency of crypto:info().
2012-12-04crypto: Add some unlisted test cases as part of the test suiteSverker Eriksson
2012-12-04crypto: Fix some documentation bugsSverker Eriksson
2012-12-04crypto: Throw notsup for DES3 CFB encryption for old opensslSverker Eriksson
An attempt to enable the use of openssl 0.9.7
2012-12-04Merge branch 'ta/docsmaster'Henrik Nord
* ta/docsmaster: Fix various doc typos for R16 Fix various typos in HOWTO/ for R16 Fix various comment typos for R16 OTP-10611
2012-12-04Merge branch 'lf/snmp-fix-typo'Henrik Nord
* lf/snmp-fix-typo: Fix typo in snmpm doc OTP-10610
2012-12-04update vsnHenrik Nord
2012-12-04Added test case for new odbc option 'extended_errors'Franko Franicevich
Test case is in odbc 'connect' suite; and just tries force an error with the extended errors flag both on and off; validating the return types. OTP-10603
2012-12-04Add extended_errors option to ODBCBernard Duggan
This patch adds the extended_errors option to odbc:connect/2. When enabled, this option alters the return code of ODBC operations that produce errors to include the ODBC error code as well as the native error code, in addition to the ODBC reason field which is returned by default. The extended error information can be used to produce more sophisticated error handling than is possible with the standard ODBC Reason alone.
2012-12-03erl_expand_records: Remove stale support for literal tuple funsBjörn Gustavsson
2012-12-01Teach is_function/2 that tuples are not funsBjörn Gustavsson
2012-11-30erts: Change default of erl_crash.dumpBjörn-Egil Dahlberg
* Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour changed) * Don't create an erl_crash.dump if heart do exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour not changed) This changes the behaviour back to the R15B02 default considering if a beam was running with no heart. The motivation is that we want a fast heart to fast restart erlang if it crashes but to be able to get non-truncated erl_crash.dumps via setting ERL_CRASH_DUMP_SECONDS if we so desire.
2012-11-30Merge branch 'fredrik/inet/export-ip-funcs/OTP-8067'Fredrik Gustafsson
* fredrik/inet/export-ip-funcs/OTP-8067: Inet doc clarifications Documentation changes inet Changes to function names, tests and docs of inet Added specs and doc Exported ipv4address and ipv6address functions to inet module, changed and made testcases
2012-11-29common_test: Fix exported typesBjörn-Egil Dahlberg
* inet:host_name() -> inet:hostname() * ct:hook_options() -> ct_netconfc:hook_options()
2012-11-29Changed structure to fix dialyzer warnings eldap.erlFredrik Gustafsson
2012-11-28Fix various doc typos for R16Tuncer Ayaz
2012-11-28Fix various typos in HOWTO/ for R16Tuncer Ayaz
2012-11-28Fix various comment typos for R16Tuncer Ayaz
2012-11-28erts: Limit memory usage of bs_construct_SUITE:huge_binarySverker Eriksson
depending on the amount of free memory on the host
2012-11-28Merge branch 'maint'Patrik Nyblom
2012-11-28Merge branch 'pan/win2012_installer' into maintPatrik Nyblom
* pan/win2012_installer: Teach Win installer to handle redist on w2012/w8 OTP-10598
2012-11-28Merge branch 'sverk/crypto-unloading'Sverker Eriksson
* sverk/crypto-unloading: crypto: Link crypto_callback statically crypto: Add debug print macros crypto: Enable runtime upgrade of crypto crypto: Make unloading of crypto safer OTP-10596
2012-11-28Merge branch 'ia/ssl/sslv2-tests'Ingela Anderton Andin
* ia/ssl/sslv2-tests: ssl: Receive port EXIT-message so that it does not get mixed up with the protocol-error message we are expecting
2012-11-27Merge branch 'egil/darwin-fixes'Björn-Egil Dahlberg
* egil/darwin-fixes: erl_interface: Avoid redefinition of ALIGNBYTES erts: Fix '#ifdef' for unused static functions erts: Remove forgotten vxworks includes hipe: Cast offsetof to int in hipe_arch_print_pcb
2012-11-27Teach Win installer to handle redist on w2012/w8Patrik Nyblom
Also made check for DLL version against redistributables instead of towards installed system, as some builds required redistributables everytime (installed dll on build machine had higher version than the redist)...
2012-11-27Merge tag 'OTP_R15B03'Björn-Egil Dahlberg
The R15B03 release
2012-11-27Added documentation for failfun, connectfun and disconnectfun in sshFredrik Gustafsson