aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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
2010-09-01Merge branch 'mp/robustify-hipe_bifs_get_hrvtime' into devBjörn Gustavsson
* mp/robustify-hipe_bifs_get_hrvtime: robustify hipe_bifs:get_hrvtime/0 OTP-8798
2010-09-01Fix crash when calling erlang:system_info(update_cpu_info)Rickard Green
Calling erlang:system_info(update_cpu_info) on platforms where no CPU topology was found could result in a crash if other CPU information had changed. This bug was introduced in the 'dev' branch before R14B (commit 1b273b618002d65159453fdfb9520a9476e4423a). That is, the bug has never been seen in a released runtime system.
2010-09-01Merge branch 'dgud/public_key/make_cert_fix' into devDan Gudmundsson
* dgud/public_key/make_cert_fix: Complete rename of erl_make_certs Rename Fix issuer issue in generated certs
2010-09-01Cleanup ssl configure partsDan Gudmundsson
2010-09-01Merge branch 'maint-r13' into devBjörn Gustavsson
* maint-r13: Remove copyright headers in vsn.mk files Conflicts: lib/appmon/vsn.mk lib/erl_docgen/vsn.mk lib/inets/vsn.mk lib/kernel/vsn.mk lib/reltool/vsn.mk lib/ssl/vsn.mk lib/stdlib/vsn.mk lib/tools/vsn.mk lib/tv/vsn.mk lib/xmerl/vsn.mk
2010-09-01Add testcase for erlang:system_info(update_cpu_info)Rickard Green
2010-09-01Remove cert building from MakefilesDan Gudmundsson
2010-09-01Fixed broken links in the documentation.Lars Thorsen
2010-09-01Remove copyright headers in vsn.mk filesBjörn Gustavsson
Copyright notices serve no useful purpose in vsn.mk files, and only complicate scripts that automatically update version numbers.
2010-09-01Checkin example certs instead of generating them.Dan Gudmundsson
Avoiding cross-compilation and other problems by keeping them in git instead of generating them each time. I think the reason to generate them was that a valid date limitation, now that we can specify the date, I have set them to be valid for 15 years.
2010-09-01Merge branch 'ia/ssl-public_key-empty-cert-chain/OTP-8788' into devIngela Anderton Andin
2010-09-01Correction due to failure of inets tests.Ingela Anderton Andin
2010-09-01Merge branch 'maint-r13' into devBjörn Gustavsson
* maint-r13: asn1 tests: Remove duplicated SUITE data directories Update of vsn.mk, relnotes and appup for patch in R13B04 track Add support for Extension addition group Conflicts: lib/asn1/test/Makefile lib/asn1/test/asn1_SUITE.erl.src lib/asn1/vsn.mk OTP-8598
2010-09-01Merge branch 'ia/ssl-public_key-empty-cert-chain/OTP-8788' into devIngela Anderton Andin
* ia/ssl-public_key-empty-cert-chain/OTP-8788: Empty certificate chain
2010-09-01Empty certificate chainIngela Anderton Andin
Handling of unkown CA certificats was changed in ssl and public_key to work as intended. In the process of doing this some test cases has been corrected as they where wrong but happened to work together with the incorrect unknown CA handling.
2010-08-31Fix xfer_active close expection for Solaris behaviourRaimo Niskanen
2010-08-31Keep default #sctp_sndrcvinfo{} fields on gen_sctp:send/4Raimo Niskanen
2010-08-31Merge branch 'rickard/cpu-info-unbind/8765' into devRickard Green
* rickard/cpu-info-unbind/8765: Fix erroneous error reports about unbind failure
2010-08-31Merge branch 'ia/test-crypto-bug' into devIngela Anderton Andin
* ia/test-crypto-bug: Add tests for crypto RC4 bug
2010-08-31Add tests for crypto RC4 bugIngela Anderton Andin
Changed test so that the test cases testing all different ciphers also sends data so that that the calls to crypto cipher functions are also tested.
2010-08-31Fix erroneous error reports about unbind failureRickard Green
On platforms where binding of schedulers is not supported, numerous error reports on the form "Scheduler <N> failed to unbind from cpu -1: enotsup" were erroneously issued. This bug was introduced in the 'dev' branch before R14B (commit 1b273b618002d65159453fdfb9520a9476e4423a). That is, the bug has never been seen in a released runtime system. Reported-By: Tuncer Ayaz
2010-08-31Fill in sinfo_assoc_id in struct sctp_sndrcvinfo for getopt()Raimo Niskanen
The assoc_id field was uninitialized causing random answers.
2010-08-31Fix SCTP linger optionRaimo Niskanen
inet:setopts(S, [{linger,{true,2}}]) returned {error,einval} for SCTP sockets. The inet_drv had a bug when checking the option size.
2010-08-31Merge branch 'dgud/ssl/handskake_client_key/OTP-8793' into devDan Gudmundsson
* dgud/ssl/handskake_client_key/OTP-8793: Fix handshake problem with multiple messages in one packet
2010-08-31Merge branch 'dgud/ssl/empty_msg_problem/OTP-8790' into devDan Gudmundsson
* dgud/ssl/empty_msg_problem/OTP-8790: Fix receiving empty packets.
2010-08-31Merge branch 'lars/docbuilder/center-tag-problem-in-edoc-to-xml/OTP-8784' ↵Lars Thorsen
into dev * lars/docbuilder/center-tag-problem-in-edoc-to-xml/OTP-8784: Fixed problem with tbody when all tables are handled the same. Fixed problem with a centered table that was transformed into an xml document which then produced mis-formatted html.
2010-08-31Merge branch 'lars/documentation-build-git/OTP-8601' into devLars Thorsen
* lars/documentation-build-git/OTP-8601: Fixed that the system documentation can be built from both a source and release structure.
2010-08-31Merge branch 'lars/erl_docgen/xsl-html-gen-for-comref/OTP-8792' into devLars Thorsen
* lars/erl_docgen/xsl-html-gen-for-comref/OTP-8792: Fixed the transformation from xml to html of the funcs block in comref pages.
2010-08-31Merge branch 'lars/remove-links-from-frontpage/OTP-8786' into devLars Thorsen
* lars/remove-links-from-frontpage/OTP-8786: Removed the links "Release highlights" and "Potential incompatibilities"
2010-08-31Complete rename of erl_make_certsDan Gudmundsson
2010-08-31Merge branch 'lars/xmerl/removed-empty-file/OTP-8789' into devLars Thorsen
* lars/xmerl/removed-empty-file/OTP-8789: Removed the empty file xmerl_dtd.erl.