aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-09-04Merge branch 'maint'Fredrik Gustafsson
2013-09-04Merge branch 'dotsimon/ei_decode_encode_SUITE_true/OTP-11289' into maintFredrik Gustafsson
* dotsimon/ei_decode_encode_SUITE_true/OTP-11289: Fix location of true binary under Mac OSX
2013-09-03Merge branch 'maint'Peter Andersson
2013-09-03Merge branch 'peppe/common_test/missing_header' into maintPeter Andersson
* peppe/common_test/missing_header: Add missing copyright header
2013-09-03Add missing copyright headerPeter Andersson
2013-09-03Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-03Merge branch 'ia/inets/stronger-test-keys' into maintIngela Anderton Andin
* ia/inets/stronger-test-keys: inets: Add stronger RSA test-keys
2013-09-03inets: Add stronger RSA test-keysIngela Anderton Andin
The ones provided will fail inets test cases as default ssl will negotiate stronger cipher suites now that will fail the with the weak keys.
2013-09-03Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-03Merge branch 'ia/ssl/client-advertised-hashalgorithms' into maintIngela Anderton Andin
* ia/ssl/client-advertised-hashalgorithms: ssl: Do not advertise support for algorithms not supported by crypto
2013-09-03Merge branch 'maint'Hans Bolinder
* maint: Fix a Unicode filename bug affecting Leex and Yecc
2013-09-03Merge branch 'hb/parsetools/unicode_bugfix/OTP-11286' into maintHans Bolinder
* hb/parsetools/unicode_bugfix/OTP-11286: Fix a Unicode filename bug affecting Leex and Yecc
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: Silence gcc warnings in non-smp build
2013-09-02Merge branch 'sv-sched-percentage-option' into maintLukas Larsson
* sv-sched-percentage-option: Silence gcc warnings in non-smp build
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: erts: Fix segfault when scheduling release_port later_op
2013-09-02Merge branch 'lukas/erts/clean_port_msg_dispatcher/OTP-11290' into maintLukas Larsson
* lukas/erts/clean_port_msg_dispatcher/OTP-11290: erts: Fix segfault when scheduling release_port later_op
2013-09-02Silence gcc warnings in non-smp buildLukas Larsson
2013-09-02ssl: Do not advertise support for algorithms not supported by cryptoIngela Anderton Andin
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: Refactor and change EXTRA_APPLICATIONS to use ls Add configure option --without-$app Conflicts: HOWTO/INSTALL.md lib/Makefile
2013-09-02Merge branch 'lukas/skip-extra-applications/OTP-11288' into maintLukas Larsson
* lukas/skip-extra-applications/OTP-11288: Refactor and change EXTRA_APPLICATIONS to use ls Add configure option --without-$app
2013-09-02Refactor and change EXTRA_APPLICATIONS to use lsLukas Larsson
2013-09-02Add configure option --without-$appLukas Larsson
This is used to skip the specified app when building and releasing
2013-09-02Merge branch 'maint'Fredrik Gustafsson
2013-09-02Merge branch 'dotsimon/pubkey_aes_cbc/OTP-11281' into maintFredrik Gustafsson
* dotsimon/pubkey_aes_cbc/OTP-11281: Allow public_key:pem_entry_decode/2) to handle AES-128-CBC ciphered keys
2013-09-02Fix a Unicode filename bug affecting Leex and YeccHans Bolinder
A bug where Unicode filenames combined with Latin-1 encoding could crash Yecc and Leex has been fixed.
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: ei ic: install headers and libs into usr
2013-09-02Merge branch 'lukas/export-ei-ic-headers-libs/OTP-11284' into maintLukas Larsson
* lukas/export-ei-ic-headers-libs/OTP-11284: ei ic: install headers and libs into usr
2013-09-02Merge branch 'maint'Peter Andersson
2013-09-02Merge remote branch 'origin/peppe/common_test/test_server_h_problem' into maintPeter Andersson
* origin/peppe/common_test/test_server_h_problem: Remove the obsolete test_server_h error handler Tag sasl and error reports with suite, group, and function in log Conflicts: lib/common_test/src/cth_log_redirect.erl OTP-11263
2013-09-02Merge branch 'maint'Peter Andersson
2013-09-02Merge remote branch 'origin/peppe/common_test/cth_log_error' into maintPeter Andersson
* origin/peppe/common_test/cth_log_error: Fix error in builtin hook calling non-existing function OTP-11238
2013-09-02Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-02Merge branch 'ia/public_key/PKCS-7-addition/OTP-10874' into maintIngela Anderton Andin
* ia/public_key/PKCS-7-addition/OTP-10874: public_key: Add support for "Simple Certificate Enrollment Protocol" to PKCS-7
2013-09-02Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-02Merge branch 'ia/ssl/ecc-digitally_signed/OTP-11229' into maintIngela Anderton Andin
* ia/ssl/ecc-digitally_signed/OTP-11229: ssl: Skip second length indicator in EC extensions ssl: Handle signature_algorithm field in digitally_signed properly with proper defaults
2013-09-02ssl: Skip second length indicator in EC extensionsIngela Anderton Andin
We have no need to care about the value of this length indicator so we do not need to match it or verify it, it is unnecessary work.
2013-09-02ssl: Handle signature_algorithm field in digitally_signed properlyIngela Anderton Andin
with proper defaults Added ssl_ECC_SUITE
2013-08-30Fix location of true binary under Mac OSXSimon Cornish
2013-08-30Merge branch 'maint'Lukas Larsson
* maint: add erl option to set schedulers by percentages
2013-08-30Merge branch 'sv-sched-percentage-option' into maintLukas Larsson
* sv-sched-percentage-option: add erl option to set schedulers by percentages OTP-11282
2013-08-29Allow public_key:pem_entry_decode/2) to handle AES-128-CBC ciphered keysSimon Cornish
Private keys generated by modern versions of ssh-keygen are ciphered with AES-128-CBC instead of DES-EDE3-CBC. Since DES-EDE3-CBC ciphered keys are handled, and the underlying support for AES-128-CBC is already present, it seems a bug of omission that AES-128-CBC ciphered keys are not.
2013-08-29add erl option to set schedulers by percentagesSteve Vinoski
For applications where measurements show enhanced performance from the use of a non-default number of emulator scheduler threads, having to accurately set the right number of scheduler threads across multiple hosts each with different numbers of logical processors is difficult because the erl +S option requires absolute numbers of scheduler threads and scheduler threads online to be specified. To address this issue, add a +SP option to erl, similar to the existing +S option but allowing the number of scheduler threads and scheduler threads online to be set as percentages of logical processors configured and logical processors available, respectively. For example, "+SP 50:25" sets the number of scheduler threads to 50% of the logical processors configured, and the number of scheduler threads online to 25% of the logical processors available. The +SP option also interacts with any settings specified with the +S option, such that the combination of options "+S 4:4 +SP 50:50" (in either order) results in 2 scheduler threads and 2 scheduler threads online. Add documentation for the +SP option. Add tests for the +SP option to scheduler_SUITE. Add tests and documentation for two existing features of the +S option: +S 0:0 resets the scheduler thread count and scheduler threads online count to their defaults, and specifying negative numbers for +S results in those values being subtracted from the default values for the host.
2013-08-29public_key: Add support for "Simple Certificate Enrollment Protocol" to PKCS-7Ingela Anderton Andin
2013-08-29ei ic: install headers and libs into usrLukas Larsson
2013-08-29Merge branch 'maint'Dan Gudmundsson
2013-08-29Merge branch 'essen/export-zlib-zstream/OTP-11278' into maintFredrik Gustafsson
* essen/export-zlib-zstream/OTP-11278: Updated preloaded Export type zlib:zstream/0
2013-08-29Merge branch 'maint'Fredrik Gustafsson
Conflicts: erts/preloaded/ebin/zlib.beam
2013-08-29Merge branch 'dgud/wx/update-doxygen/OTP-11279' into maintDan Gudmundsson
* dgud/wx/update-doxygen/OTP-11279: wx: Add toolbar testcase wx: Add character event test/example wx: Add wxPanel:setFocusIgnoringChildren/1 wx: Add wxClipboardTextEvent wx: Fix bug in wxStatusBar:getFieldRect/2 wx: Fix api generator
2013-08-29Merge branch 'dgud/mnesia/checkpoint-init/OTP-10957' into maintDan Gudmundsson
* dgud/mnesia/checkpoint-init/OTP-10957: mnesia: Checkpoint fix mnesia: Improve checkpoint activation mnesia: Improve checkpoint tests mnesia: Cleanup and remove obsolete code
2013-08-29Merge branch 'essen/export-zlib-zstream/OTP-11278' into maintFredrik Gustafsson
* essen/export-zlib-zstream/OTP-11278: Updated preloaded Export type zlib:zstream/0