aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-09-02Test nocache option of mod_cgi and mod_esiJohannes Weißl
Tests that the nocache options work and can be used independently from each other. This was broken before c8ef69c. Conflicts: lib/inets/test/httpd_basic_SUITE.erl
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-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 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 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 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 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-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 '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 '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-29mnesia: Checkpoint fixDan Gudmundsson
Avoid hanging waiting for other processes on other node to commit.
2013-08-29mnesia: Improve checkpoint activationDan Gudmundsson
Fixed a race where some parts of a transaction could be added to the checkpoint. There are probably more races here but this improves the current testcases.
2013-08-29mnesia: Improve checkpoint testsDan Gudmundsson
2013-08-29mnesia: Cleanup and remove obsolete codeDan Gudmundsson
We don't support communicating with such old nodes anyway.
2013-08-29Updated preloadedFredrik Gustafsson
2013-08-28Remove the obsolete test_server_h error handlerPeter Andersson
2013-08-28Tag sasl and error reports with suite, group, and function in logPeter Andersson
2013-08-28Merge branch 'ia/ssl/concurrerr/OTP-11255' into maintIngela Anderton Andin
* ia/ssl/concurrerr/OTP-11255: ssl: Make the ssl manager name for erlang distribution over SSL/TLS relative to the module name of the ssl_manager.
2013-08-28ssl: Make the ssl manager name for erlang distribution over SSL/TLSIngela Anderton Andin
relative to the module name of the ssl_manager. This can be beneficial when making tools that rename modules for internal processing in the tool.
2013-08-28Merge branch 'tab/tramp_emacs_erl/OTP-11270' into maintFredrik Gustafsson
* tab/tramp_emacs_erl/OTP-11270: tools: In Emacs it is possible to remotely edit a file, by opening for example /ssh:somehost.com:/path/to/file.erl. In Emacs, the feature that makes this possible, is called TRAMP. When compiling such a file, by typing C-c C-k, an inferior Erlang shell is opened on the remote host, but the compilation expression that was evaluated in the remote Erlang shell was:
2013-08-28Merge branch 'fredrik/ssl/log_alert_doc/OTP-11271' into maintFredrik Gustafsson
* fredrik/ssl/log_alert_doc/OTP-11271: ssl: documentation regarding log_alert
2013-08-28Merge branch 'hb/parsetools/fix_yecc_bug/OTP-11269' into maintHans Bolinder
* hb/parsetools/fix_yecc_bug/OTP-11269: Fix a Yecc bug
2013-08-28Fix a Yecc bugHans Bolinder
A bug causing Yecc to generate badly formed parsers when encountering very simple recursive rules has been fixed. Thanks to Eric Pailleau for reporting the bug.
2013-08-27ssl: documentation regarding log_alertFredrik Gustafsson
2013-08-27Fix error in builtin hook calling non-existing functionPeter Andersson
OTP-11238
2013-08-27wx: Add toolbar testcaseDan Gudmundsson
2013-08-27wx: Add character event test/exampleDan Gudmundsson
2013-08-27tools:Fredrik Gustafsson
In Emacs it is possible to remotely edit a file, by opening for example /ssh:somehost.com:/path/to/file.erl. In Emacs, the feature that makes this possible, is called TRAMP. When compiling such a file, by typing C-c C-k, an inferior Erlang shell is opened on the remote host, but the compilation expression that was evaluated in the remote Erlang shell was: c("/ssh:somehost.com:/path/to/file", [...]). which resulted in a "no such file or directory" error. This commit changes the compilation expression into: c("/path/to/file", [...]). for files opened remotely via TRAMP. The file name is adjusted similarly when compiling .yrl and .xrl files. In a buffer opened remotely, the Elisp function buffer-file-name returns the full path with TRAMP syntax. In this example it would be "/ssh:somehost.com:/path/to/file.erl". A new function, erlang-local-buffer-file-name, has been introduced, which peels off the TRAMP syntax on remotely opened files, while for locally opened files, it just calls buffer-file-name.
2013-08-26Merge branch 'nox/match-context-return/OTP-11247' into maintFredrik Gustafsson
* nox/match-context-return/OTP-11247: Added primary bootstrap Forbid returning a match context in beam_validator
2013-08-26Merge branch 'sze/edlin_understand_keys/OTP-11251' into maintFredrik Gustafsson
* sze/edlin_understand_keys/OTP-11251: Added primary bootstrap erts: fixed documentation regarding tty and arrow keys make edlin understand a few important control keys
2013-08-26Merge branch 'alexrp/export_edge/OTP-11266' into maintFredrik Gustafsson
* alexrp/export_edge/OTP-11266: Export the edge/0 type from the digraph module
2013-08-23Merge branch 'epa/add_fd_usage_in_rb/OTP-11252' into maintFredrik Gustafsson
* epa/add_fd_usage_in_rb/OTP-11252: kernel: sasl: fixed rb.xml docs Add Fd usage in rb logging
2013-08-23Merge branch 'pan/bad_async_thread_distribution/OTP-11243' into maintPatrik Nyblom
* pan/bad_async_thread_distribution/OTP-11243: Create better distribution of files over async threads Initialize errno properly in win32 efile_may_openfile Add debug functionality to retrieve async key OTP-11243 OTP-11265
2013-08-23Create better distribution of files over async threadsPatrik Nyblom
The actual port id is used to create a key from the pointer value which is the ErlDrvPort. To do this a new driver api function driver_async_port_key is added and the driver API minor version is updated. The documentation is updated and the faulty description of how to spread ports over async threads is updated to use the new API. Testcase also added.
2013-08-23Initialize errno properly in win32 efile_may_openfilePatrik Nyblom
2013-08-23Add debug functionality to retrieve async keyPatrik Nyblom
2013-08-23Merge branch 'maint-r16' into maintFredrik Gustafsson
2013-08-23Merge branch 'maint-r15' into maint-r16Fredrik Gustafsson
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_transport.erl lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl.erl lib/ssl/src/ssl_internal.hrl lib/ssl/src/tls_connection.erl lib/ssl/vsn.mk
2013-08-23wx: Add wxPanel:setFocusIgnoringChildren/1Dan Gudmundsson
It was missing and needed
2013-08-23Merge branch 'lukas/erts/crash_dump_acul/OTP-11264' into maintLukas Larsson
* lukas/erts/crash_dump_acul/OTP-11264: erts: Fix print out of acul option in crash dump
2013-08-23Merge branch 'lukas/erts/efile_undef_behaviour/OTP-11246' into maintLukas Larsson
* lukas/erts/efile_undef_behaviour/OTP-11246: erts: Fix bug in translating ev macros to functions
2013-08-23erts: Fix print out of acul option in crash dumpLukas Larsson
2013-08-23Merge branch 'maint-r15' into maint-r16Björn Gustavsson
Note that this is a fake merge. The bug fix changes files that are no longer present in maint, and the bug will need to be fixed in a different way. * maint-r15: Prepare release PER, UPER: Fix encoding/decoding of open types greater than 16K