aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2010-09-08Merge branch 'ia/ssl-forgot-DH-params-DER' into devIngela Anderton Andin
* ia/ssl-forgot-DH-params-DER: Add missed DER dh option.
2010-09-07Correct typos in erlang.xmlTuncer Ayaz
semanticts -> semantics where -> were ddl -> dll NIF's -> NIFs OS-dependant -> OS-dependent
2010-09-07Merge branch 'ph/auto_recognize_ipv6' into devBjörn Gustavsson
* ph/auto_recognize_ipv6: Add tests Let an 8-tuple given as ip_address() for gen_tcp/gen_udp/gen_sctp imply 'inet6' OTP-8822
2010-09-07Merge branch 'lars/xmerl/xmerl_scan_hex_entities/OTP-8697' into devLars Thorsen
* lars/xmerl/xmerl_scan_hex_entities/OTP-8697: Fix improperly hex replacement when document is in UTF-8 format.
2010-09-07Merge branch 'pg/fix-hipe-crash-in-gc_after_bif' into devBjörn Gustavsson
* pg/fix-hipe-crash-in-gc_after_bif: Fix call to erts_gc_after_bif_call in hipe glue
2010-09-07Merge branch 'mk/net-dragonfly-bsd-patches' into devBjörn Gustavsson
* mk/net-dragonfly-bsd-patches: Remove unused variables Use proper install method Add support for DragonFly BSD Add support for NetBSD
2010-09-07Add missed DER dh option.Ingela Anderton Andin
2010-09-07Merge branch 'ia/ssl/server-verify-fun/OTP-8770' into devIngela Anderton Andin
* ia/ssl/server-verify-fun/OTP-8770: Handling of path validation errors by the application
2010-09-06Handling of path validation errors by the applicationIngela Anderton Andin
Changed the behavior of the verify_fun option so that the application can be responsible for handling path validation errors even on the server side. Also replaced the not yet documented validate_extensions_fun to be handled by the verify_fun instead. If the verify callback fun returns {fail, Reason}, the verification process is immediately stopped and an alert is sent to the peer and the TLS/SSL handshake is terminated. If the verify callback fun returns {valid, UserState}, the verification process is continued. If the verify callback fun always returns {valid, UserState}, the TLS/SSL handshake will not be terminated with respect to verification failures and the connection will be established. The verify callback fun will also be able to verify application specific extensions.
2010-09-06Merge branch 'ta/asn1-test-compile-options' into devBjörn Gustavsson
* ta/asn1-test-compile-options: Fix asn1_SUITE test_compile_options:verbose/1
2010-09-06Merge branch 'ta/asn1ct-fix-whitespace' into devBjörn Gustavsson
* ta/asn1ct-fix-whitespace: asn1ct: change unusual whitespace char from 0xA0 to 0x20
2010-09-06Merge branch 'ms/inet-bug-fixes' into devBjörn Gustavsson
* ms/inet-bug-fixes: inet: support retrieving MAC address on BSD inet: fix getservbyname buffer overflow inet: fix ifr_name buffer overflow inet: null terminate ifr_name buffer OTP-8816
2010-09-06Fix improperly hex replacement when document is in UTF-8 format.Lars Thorsen
2010-09-06Fix call to erts_gc_after_bif_call in hipe gluePaul Guyot
R12B-0 changed the signature of erts_gc_after_bif_call and it now takes 4 parameters instead of 2 in R11B-5. Yet, the glue code was not updated accordingly. As a result, the function erts_gc_after_bif_call was called with garbage and would randomly cause a crash later in the garbage collector code. The fix consists in passing NULL and 0 for the third and fourth parameters, since there is no term to add to rootset, recovering the behaviour of R11B-5 (see otp_src_R11B-5/erts/emulator/beam/erl_gc.c, line 314). (Includes assembly language fixes and code style improvements suggested by Mikael Pettersson.)
2010-09-06Add testsRaimo Niskanen
Conflicts: lib/kernel/test/gen_sctp_SUITE.erl
2010-09-06Let an 8-tuple given as ip_address() for gen_tcp/gen_udp/gen_sctp imply 'inet6'Per Hedeland
Currently an 8-tuple representing an IPv6 address is not accepted by gen_tcp:listen/2, gen_tcp:connect/3,4, gen_udp:open/2, or gen_sctp:open/1,2, unless the 'inet6' option is also given. This means that an application that has obtained the address, e.g. from configuration that allows for either IPv4 or IPv6, must always check the type of the address before passing it to these functions. Letting the functions infer 'inet6' from the 8-tuple, in case other options do not override this choice, improves usability.
2010-09-06Merge branch 'ms/ei-overflow-fix' into devBjörn-Egil Dahlberg
* ms/ei-overflow-fix: ei: prevent overflow in ei_connect_init/ei_xconnect OTP-8814
2010-09-06Merge branch 'ms/ei_connect-doc-examples' into devBjörn-Egil Dahlberg
* ms/ei_connect-doc-examples: ei_connect: correct man page examples OTP-8813
2010-09-06Merge branch 'pan/nif-valgrind-leak/OTP-8806' into devPatrik Nyblom
* pan/nif-valgrind-leak/OTP-8806: Remove warning about experimental status of NIFs from erlang.xml Stop leaking memory in nif_SUITE:send* testcases
2010-09-06Remove warning about experimental status of NIFs from erlang.xmlPatrik Nyblom
Also made the SEEALSO link at the bottom of erl_nif.xml more "erlangish".
2010-09-06Stop leaking memory in nif_SUITE:send* testcasesPatrik Nyblom
The make_term_n function in nif_SUITE.c created resources that never got released, creating valgrind memcheck Definitely Lost warnings.
2010-09-06Merge branch 'rickard/scheduler-wakeup-threshold/OTP-8811' into devRickard Green
* rickard/scheduler-wakeup-threshold/OTP-8811: Add scheduler wakup threshold as command line argument Lower the scheduler wakeup threshold
2010-09-06Merge branch 'rickard/crypto-memory-leak/OTP-8810' into devRickard Green
* rickard/crypto-memory-leak/OTP-8810: Fix memory leaks in crypto
2010-09-04Add scheduler wakup threshold as command line argumentRickard Green
The scheduler wakeup threshold is now possible to adjust at system boot. For more information see the `+swt' command line argument of `erl'.
2010-09-04Lower the scheduler wakeup thresholdRickard Green
Lower the scheduler wakeup threshold since schedulers aren't spuriously woken as before (since commit 59ee2a593090e7d53c97ceba63cbd300d1b9657e).
2010-09-03Fix memory leaks in cryptoRickard Green
2010-09-03Merge branch 'rickard/valgrind-improvements/OTP-8760' into devRickard Green
* rickard/valgrind-improvements/OTP-8760: Build opt, debug and valgrind libraries as separate libraries Add erlang:system_info(build_type) Fix valgrind build
2010-09-03inet: support retrieving MAC address on BSDMichael Santos
On systems supporting getaddrinfo(), support looking up the MAC address from inet:ifget/2. The results have the same quirks as with Linux: if the MAC address is longer than 6 bytes (e.g., fw0 under Mac OS X), the address is truncated; if the interface does not have a MAC address (e.g., lo0), an address consisting of 0's is returned.
2010-09-03Merge branch 'ia/ssl-DER-input/OTP-8723' into devIngela Anderton Andin
* ia/ssl-DER-input/OTP-8723: DER format in API
2010-09-03DER format in APIIngela Anderton Andin
Added support for inputing certificates and keys directly in DER format these options will override the pem-file options if specified.
2010-09-03Merge branch 'tj/ct-timestamp-granularity' into devBjörn Gustavsson
* tj/ct-timestamp-granularity: Include milliseconds in timestamps in Common Test log entries OTP-8808
2010-09-03Merge branch 'nick/ssh/fix-process-leak/OTP-8807' into devnick
* nick/ssh/fix-process-leak/OTP-8807: Fix race condition when terminating a connection. fix process leak in ssh_system_sup (dynamicaly created childs where not cleaned up)
2010-09-02Build opt, debug and valgrind libraries as separate librariesRickard Green
The NIF library for crypto can now be built for valgrind and/or debug as separate NIF libraries that will be automatically loaded if the runtime system has been built with a matching build type.
2010-09-02Add erlang:system_info(build_type)Rickard Green
Added erlang:system_info(build_type) which makes it easier to chose drivers, NIF libraries, etc based on build type of the runtime system.
2010-09-02Fix valgrind buildRickard Green
2010-09-02Fix race condition when terminating a connection.nick
2010-09-02fix process leak in ssh_system_sup (dynamicaly created childs where not ↵Stefan Grundmann
cleaned up) The ssh_system_sup supervisor supervises one ssh_subsystem_sup process for every client connection. There was no functionality to free resources (terminate_child/ delete_child) when a client connection was closed. Which lead to one ssh_subsystem_sup and one ssh_channel_sup process left over. This commit adds ssh_system_sup:stop_subsystem/2 and code that calls it in ssh_connection_manager:terminate/2.
2010-09-02Merge branch 'dgud/ssl-commit-example-certs' into devDan Gudmundsson
* dgud/ssl-commit-example-certs: Cleanup ssl configure parts Remove cert building from Makefiles Checkin example certs instead of generating them.
2010-09-02Merge branch 'rickard/cpu-info-testcase/OTP-8765' into devRickard Green
* rickard/cpu-info-testcase/OTP-8765: Fix crash when calling erlang:system_info(update_cpu_info) Add testcase for erlang:system_info(update_cpu_info)
2010-09-02Merge branch 'maint-r13' into devHans Bolinder
Conflicts: lib/kernel/doc/src/notes.xml lib/kernel/vsn.mk
2010-09-02Merge branch 'rani/sctp-sndrcvinfo/OTP-8795' into devRaimo Niskanen
* rani/sctp-sndrcvinfo/OTP-8795: Fix xfer_active close expection for Solaris behaviour Keep default #sctp_sndrcvinfo{} fields on gen_sctp:send/4 Fill in sinfo_assoc_id in struct sctp_sndrcvinfo for getopt() Conflicts: lib/kernel/test/gen_sctp_SUITE.erl
2010-09-02Merge branch 'rani/sctp-linger-bugfix/OTP-8726' into devRaimo Niskanen
* rani/sctp-linger-bugfix/OTP-8726: Fix SCTP linger option
2010-09-02Merge branch 'rani/sctp-udp-recv-error/OTP-8729' into devRaimo Niskanen
* rani/sctp-udp-recv-error/OTP-8729: Add test for gen_udp:connect Fix inet_drv to detect passive mode UDP errors for SCTP builds
2010-09-02Merge branch 'lars/et/broken-links-in-documentation/OTP-8796' into devLars Thorsen
* lars/et/broken-links-in-documentation/OTP-8796: Fixed broken links in the documentation.
2010-09-01Prepare releaseErlang/OTP
2010-09-01Merge branch 'hb/kernel/net_set_ticktime/OTP-8787' of ../hasse_otp into HEADErlang/OTP
* 'hb/kernel/net_set_ticktime/OTP-8787' of ../hasse_otp: Fix a bug that could cause the net_kernel process to crash.
2010-09-01Merge branch 'pg/fix-hipe-load' into devBjörn Gustavsson
* pg/fix-hipe-load: Fix hipe:load/1 OTP-8802
2010-09-01Merge branch 'pg/fix-segfault-on-crash_dump-with-hipe' into devBjörn Gustavsson
* pg/fix-segfault-on-crash_dump-with-hipe: Fix segmentation fault when dumping the crash log with hipe enabled and natively compiled modules OTP-8801
2010-09-01Merge branch 'mp/fix-hipe-icode-exceptions' into devBjörn Gustavsson
* mp/fix-hipe-icode-exceptions: fix crash in hipe_icode_exceptions OTP-8800
2010-09-01Merge branch 'mp/fix-hipe-on_load_crash' into devBjörn Gustavsson
* mp/fix-hipe-on_load_crash: fix native code crash when calling unloaded module with on_load function OTP-8799