aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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-27ssl: Receive port EXIT-message so that it does not get mixed up with the ↵Ingela Anderton Andin
protocol-error message we are expecting
2012-11-27Merge branch 'ia/ssl/peer-cert-server'Ingela Anderton Andin
* ia/ssl/peer-cert-server: ssl: Add test case for ssl:peercert with client certification
2012-11-27Merge branch 'ia/ssl/new-server-options-reuse-session/OTP-10595'Ingela Anderton Andin
* ia/ssl/new-server-options-reuse-session/OTP-10595: ssl: Add and enhance tests ssl: Consider new server options when resuming a session
2012-11-27ssl: Add and enhance testsIngela Anderton Andin
2012-11-27ssl: Consider new server options when resuming a sessionIngela Anderton Andin
If an ssl server is restarted with new options and a client tries to reuse a session the server must make sure that it complies to the new options before agreeing to reuse it.
2012-11-27Merge branch 'ia/ssl/make-depend/OTP-10594'Ingela Anderton Andin
* ia/ssl/make-depend/OTP-10594: ssl: Add dependencies to Makefile
2012-11-26Prepare releaseOTP_R15B03Erlang/OTP
2012-11-26ssl: Add dependencies to MakefileIngela Anderton Andin
2012-11-26Merge branch 'bjorn/asn1/clean-up-backends/OTP-10410'Björn Gustavsson
* bjorn/asn1/clean-up-backends/OTP-10410: Simplify the code for the generated info/0 function Don't try to work around a non-loadable NIF library Fix BER encoding when multiple levels of typedefs are used Update megaco documentation Update documentation for the asn1 application Fix other applications Fix use of asn1 in megaco Remove the unused asn1ct_gen_ber module Remove the unused asn1ct_constructed_ber module Remove the unused asn1ct_per_bin module Remove unused functions in asn1rt_ber_bin Remove obsolete back-ends and simplify the options Make the specialized decodes work with the 'nif' option Remove support for the obsolete {Typename,Value} tuple notation Remove tests for the obsolete {TypeName,Value} notation Remove the obsolete and deprecated 'keyed_list' option
2012-11-26Merge branch 'bjorn/ct/separate-io-server/OTP-10101'Björn Gustavsson
* bjorn/ct/separate-io-server/OTP-10101: Fix race condition in test_server_io
2012-11-26Merge branch 'bjorn/ct/env-vars/OTP-10469'Björn Gustavsson
* bjorn/ct/env-vars/OTP-10469: Add support for passing environment variables in master mode Remove redundant sleep in ct_master_SUITE Test that test cases succeed Add ct_test_support:verify_events/4 which takes a node name
2012-11-26Simplify the code for the generated info/0 functionBjörn Gustavsson
While at it, also make the generated code for the attributes more readable.
2012-11-26Don't try to work around a non-loadable NIF libraryBjörn Gustavsson
The NIF library is now mandatory. The call to application:get_env/2 to find out whether the NIF library is loaded is surprisingly expensive.
2012-11-26Fix BER encoding when multiple levels of typedefs are usedBjörn Gustavsson
2012-11-26Update megaco documentationBjörn Gustavsson
2012-11-26Update documentation for the asn1 applicationBjörn Gustavsson
2012-11-26Fix other applicationsBjörn Gustavsson
2012-11-26Fix use of asn1 in megacoBjörn Gustavsson
2012-11-26Remove the unused asn1ct_gen_ber moduleBjörn Gustavsson
2012-11-26Merge branch 'maint'Björn-Egil Dahlberg
2012-11-26Merge branch 'egil/fix-heart-unregister' into maintBjörn-Egil Dahlberg
* egil/fix-heart-unregister: kernel: Heart port needs to be unregistered
2012-11-26Merge branch 'maint'Raimo Niskanen
2012-11-26Merge branch 'raimo/daily-build-fixes' into maintRaimo Niskanen
* raimo/daily-build-fixes: Fix erroneous skipping for jinterface, erl_interface and ic
2012-11-26Fix erroneous skipping for jinterface, erl_interface and icRaimo Niskanen
2012-11-23kernel: Heart port needs to be unregisteredBjörn-Egil Dahlberg
When heart cycles we need to unregister the old port before starting the new heart port program. OTP-10591
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Update preloaded modulesBjörn-Egil Dahlberg
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Update primary bootstrapBjörn-Egil Dahlberg
2012-11-23Merge branch 'maint'Patrik Nyblom
Conflicts: erts/doc/src/erlang.xml
2012-11-23Merge branch 'pan/process_info_spec_doc/r15/OTP-10584' into maintPatrik Nyblom
* pan/process_info_spec_doc/r15/OTP-10584: Correct doc of process_info(Pid,links) OTP-10584
2012-11-23Merge branch 'pan/bs_append_crash' into maintPatrik Nyblom
* pan/bs_append_crash: Teach erts_bs_append not to dump core OTP-10590
2012-11-23Merge branch 'maint'Anders Svensson
2012-11-23Merge branch 'anders/diameter/doc/OTP-10568' into maintAnders Svensson
* anders/diameter/doc/OTP-10568: Update doc for RFC 6733 Add copies of RFC's 6733 and 6737
2012-11-23Merge branch 'anders/diameter/doc/OTP-10471' into maintAnders Svensson
* anders/diameter/doc/OTP-10471: Add missing diameter_codec(3) content Add content to diameter_codec(3) and diameter_make(3) Add reference pages diameter_codec(3) and diameter_make(3)
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Update copyright yearsBjörn-Egil Dahlberg
2012-11-23Merge branch 'peppe/common_test/group_search_r15b03.fix'Peter Andersson