aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
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 '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 '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 '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 '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-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-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-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-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 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/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-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.
2010-08-31RenameDan Gudmundsson
2010-08-31Fix issuer issue in generated certsDan Gudmundsson
2010-08-30fix crash in hipe_icode_exceptionsMikael Pettersson
This fixes a problem in the HiPE compiler's BEAM-to-Icode pass where it can crash due to the BEAM compiler's merging of identical basic blocks with different exception handling contexts. This bug has been latent, but is now exposed by what appears to be more aggressive optimizations in BEAM. The added comment explains things in more detail.
2010-08-30Merge branch 'pan/ets_binary_overhead/OTP-8762' into devPatrik Nyblom
* pan/ets_binary_overhead/OTP-8762: Remove binary overhead counter from ets objects
2010-08-30Merge branch 'pan/ets_select_reverse/OTP-7863' into devPatrik Nyblom
* pan/ets_select_reverse/OTP-7863: Add documentation for ets:select_reverse/1/2/3 Add testcase for ets:select_reverse/1/2/3
2010-08-30Merge branch 'pan/ms_transform_warnings/OTP-6759' into devPatrik Nyblom
* pan/ms_transform_warnings/OTP-6759: Add testcases for ms_transform warning and fix scoping Add warnings for shadowed variables in ms_transform funs
2010-08-30Merge branch 'pg/fix-crypto-rc4_encrypt_with_state' into devRickard Green
* pg/fix-crypto-rc4_encrypt_with_state: Fix RC4 stream cipher binding (crypto:rc4_encrypt_with_state/2) OTP-8781 - RC4 stream cipher didn't work. This since the new NIF implementation of crypto:rc4_encrypt_with_state/2 introduced in crypto-2.0 didn't return an updated state. (Thanks to Paul Guyot)
2010-08-30Merge branch 'rickard/ssl-cross/OTP-8791' into devRickard Green
* rickard/ssl-cross/OTP-8791: Fix SSL build failure when building in minimal source tree Fix SSL build failure when building in minimal source tree
2010-08-27Fix SSL build failure when building in minimal source treeRickard Green
Building in a source tree without prebuilt platform independent build results failed on the SSL examples when building on Windows.
2010-08-27Fix receiving empty packets.Dan Gudmundsson
Empty packets where not delivered from ssl, it incorrectly assumed there was no data.
2010-08-27Fix SSL build failure when building in minimal source treeRickard Green
Building in a source tree without prebuilt platform independent build results failed on the SSL examples when cross building. This has been solved by not building the SSL examples during a cross build.
2010-08-27Fix hipe:load/1Paul Guyot
hipe:load/1 (and unexported hipe:load/2) just did not work. Calling it would fail with a badmatch because only the hipe chunk was passed to do_load/3's third parameter called WholeModule. Since this parameter is then passed to beam_lib:all_chunks/1 which accepts the whole module as a binary as well as a path to the beam file, and since a path is exactly what we have in load/2, the fix consists in letting do_load/3 accept a path and passing it from load/2.
2010-08-27Merge branch 'maint-r13' into devBjörn Gustavsson
* maint-r13: Add test suite for jinterface
2010-08-27Merge branch 'kenneth/asn1/ExtensionAdditionGroup/OTP-8598' of ↵Erlang/OTP
../kenneth_otp into HEAD * 'kenneth/asn1/ExtensionAdditionGroup/OTP-8598' of ../kenneth_otp: Update of vsn.mk, relnotes and appup for patch in R13B04 track Add support for Extension addition group
2010-08-27Merge branch 'bjorn/asn1/eliminate-duplicate-data-dir' of ../bjorn_otp into HEADErlang/OTP
* 'bjorn/asn1/eliminate-duplicate-data-dir' of ../bjorn_otp: asn1 tests: Remove duplicated SUITE data directories
2010-08-27Merge branch 'bjorn/jinterface-test-suite' into maint-r13Björn Gustavsson
* bjorn/jinterface-test-suite: Add test suite for jinterface
2010-08-27asn1 tests: Remove duplicated SUITE data directoriesBjörn Gustavsson
Having multiple copies is a maintenance nightmare.
2010-08-27Merge branch 'dgud/wx/TreeCtrl_editlabel/OTP-8767' into devDan Gudmundsson
* dgud/wx/TreeCtrl_editlabel/OTP-8767: Add .gitignore Added missing wxTextCtrl:editLabel/2.
2010-08-27Fixed problem with tbody when all tables are handled the same.Lars Thorsen
2010-08-27Fixed the transformation from xml to html of the funcs block in comref pages.Lars Thorsen
2010-08-26Fix handshake problem with multiple messages in one packetDan Gudmundsson
If hello and client_key_exchange message is sent together in the same packet, ssl can't handle it and closes the connection. Also fixed compiler warning.