aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2015-05-20Merge branch 'evnu/fix-cprof-typo'Zandra Hird
* evnu/fix-cprof-typo: Fix typo in cprof documentation
2015-05-20Merge branch 'saleyn/eunit'Zandra Hird
* saleyn/eunit: Add ?assertReceive(Guard, Timeout) macro to eunit OTP-12753
2015-05-20Merge branch 'jeffweiss/fix_eldap_timeout_documentation'Henrik Nord
* jeffweiss/fix_eldap_timeout_documentation: Correct module in eldap timeout docs
2015-05-20Merge branch 'master' of git-server:otpLars Thorsen
Conflicts: lib/orber/src/orber.app.src
2015-05-20[erl_docgen] Bump versionLars Thorsen
2015-05-20[orber] Update runtime dependency to stdlibLars Thorsen
2015-05-20Merge branch 'peppe/test_server/erl2html2_failure'Peter Andersson
* peppe/test_server/erl2html2_failure: Fix problem not recognizing 'macro' tuple from epp_dodger Fix failing test case and handling double functions on one line OTP-12740
2015-05-20Merge branch 'richcarl/add-uptime-function'Henrik Nord
* richcarl/add-uptime-function: Add uptime() shell command OTP-12752
2015-05-20Merge branch 'MSch/patch-1'Henrik Nord
* MSch/patch-1: Remove erlang:display/1 calls
2015-05-20dialyzer: Document dialyzer:gui() option 'check_plt'Hans Bolinder
* Mention the option 'check_plt' among gui() options. * No longer check a PLT twice when the analysis type is 'plt_check'. * No longer raise a case_clause error when checking a PLT finds warnings. Thanks to James Fish.
2015-05-19Merge branch 'vladdu/jinterface_javadoc_fix'Henrik Nord
* vladdu/jinterface_javadoc_fix: Remove extra @param in javadoc OTP-12746
2015-05-19Merge branch 'egil/maps-filter/OTP-12745'Björn-Egil Dahlberg
* egil/maps-filter/OTP-12745: stdlib: Use lc to implement maps:map/2 stdlib: Test maps:filter/2 stdlib: Document maps:filter/2 stdlib: Add maps:filter/2
2015-05-19stdlib: Use lc to implement maps:map/2Björn-Egil Dahlberg
2015-05-19stdlib: Test maps:filter/2Björn-Egil Dahlberg
2015-05-18Merge branch 'ia/ssl/sleep-cuddle'Ingela Anderton Andin
* ia/ssl/sleep-cuddle: ssl: Adjust sleep time in test case
2015-05-18ssl: Adjust sleep time in test caseIngela Anderton Andin
Adjust time to make sure "enough" time has elapsed. Will have to do for now.
2015-05-18Merge branch 'ia/ssl/doc/types'Ingela Anderton Andin
* ia/ssl/doc/types: ssl: Align "=" sign in type declarations to decided policy
2015-05-18Merge branch 'ia/ssh/doc/types'Ingela Anderton Andin
* ia/ssh/doc/types: ssh: Align "=" sign in type declarations to decided policy
2015-05-18Add ?assertReceive(Guard, Timeout) macro to eunitSerge Aleynikov
A convenience macro used for testing message passing logic by allowing to fail if a message matching a `Guard` is not received in the mailbox of the current process.
2015-05-18Fix typo in cprof documentationMagnus Ottenklinger
2015-05-18stdlib: Document maps:filter/2Björn-Egil Dahlberg
2015-05-18stdlib: Add maps:filter/2Björn-Egil Dahlberg
2015-05-18Merge branch 'maint'Zandra Hird
Conflicts: OTP_VERSION lib/ssh/doc/src/ssh.xml lib/ssh/vsn.mk
2015-05-18Update release notesErlang/OTP
2015-05-18Merge branch 'hans/ssh/ssh_msg_debug_fun/OTP-12738' into maint-17Erlang/OTP
* hans/ssh/ssh_msg_debug_fun/OTP-12738: ssh: option for handling the SSH_MSG_DEBUG message's printouts
2015-05-18stdlib: Add gb_sets:iterator_fromHans Bolinder
2015-05-18stdlib: Add gb_trees:iterator_frombeaver
2015-05-13ssl: Align "=" sign in type declarations to decided policyIngela Anderton Andin
2015-05-13Fix problem not recognizing 'macro' tuple from epp_dodgerPeter Andersson
OTP-12740
2015-05-13ssh: option for handling the SSH_MSG_DEBUG message's printoutsHans Nilsson
A fun could be given in the options that will be called whenever the SSH_MSG_DEBUG message arrives. This enables the user to format the printout or just discard it. The default is changed to not print the message. In RFC4253 printing is a SHOULD, but our new default is to protect logs from dos attacs.
2015-05-13Fix failing test case and handling double functions on one linePeter Andersson
2015-05-13Revert "Prepare release"Henrik Nord
This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
2015-05-12Prepare releaseErlang/OTP
2015-05-12inets: reject negative content-lengthHans Nilsson
2015-05-12ssl: Refactored and corrected sni_fun handlingIngela Anderton Andin
Dialyzer warned about the incorrect match of Packets. Code was refactored and the problem avoided in the process. Dialyzer warned that the empty tuple is not a function as the contract said it should be. Changed the handling of the sni_fun default value to be undefined and added it to the contract.
2015-05-12ssl: add option sni_funQijiang Fan
The newly added function sni_fun allows dynamic update of SSL options like keys and certificates depending on different SNI hostname, rather than a predefined rules of SSL options.
2015-05-12ssl: add tests for SNI server supportQijiang Fan
This commit adds tests for SNI server support in: * ssl_sni_SUITE.erl * ssl_to_openssl_SUITE.erl And some more modifications: * make_certs also makes two certs for SNI, and adds extra options for SNI.
2015-05-12ssl: docs: SNI server, connection_information/1,2Qijiang Fan
2015-05-12ssl: add ssl:connection_information/[1,2]Qijiang Fan
This commit adds a new function, ssl:connection_information/[1,2] to retrive the connection information from a SSLSocket. And also, this deprecates a function ssl:connection_info/1, and reimplements connection_info/1 with the new function.
2015-05-12ssl: deny recursively defined sni_hostsQijiang Fan
2015-05-12ssl: add SNI server supportQijiang Fan
2015-05-12Merge branch 'jv/18/emulator-send-to-error_logger/OTP-12735'Björn-Egil Dahlberg
* jv/18/emulator-send-to-error_logger/OTP-12735: erts: Fix erts_send_error_term_to_logger memory leak Send format and args on process exit to error_logger Add erts_send_error_term_to_logger
2015-05-12Merge branch 'peppe/webtool/update_vsn'Peter Andersson
* peppe/webtool/update_vsn: Update webtool version
2015-05-12ssh: Align "=" sign in type declarations to decided policyIngela Anderton Andin
2015-05-12Add uptime() shell commandRichard Carlsson
2015-05-12ssh: Fix ssh_basic_SUITE.erl to work on Windows hostsHans Nilsson
The test cases id_string_no_opt_client id_string_own_string_client id_string_random_client didn't work on MS Windows. This commit adds {packet,line} to get the whole version exchange line in one packet on all architectures. It also adds timeouts to speed up failures in those test cases.
2015-05-12Merge branch 'dgud/mnesia/dirty_error_reason/OTP-12714'Dan Gudmundsson
* dgud/mnesia/dirty_error_reason/OTP-12714: mnesia: dirty error messages did not behave as documented
2015-05-12Merge branch 'ia/ssl/adapt-to-new-public_key-doc'Ingela Anderton Andin
* ia/ssl/adapt-to-new-public_key-doc: ssl: Align "=" sign in type declarations to decided policy public_key: Align "=" sign in type declarations to decided policy public_key, ssl: Align public_key and ssl doc
2015-05-12ssh: Fix typoIngela Anderton Andin
Option height was misspelled in the code. Fix code but recognize the mispellt option for backwards compatible reasons.
2015-05-12Remove extra @param in javadocVlad Dumitrescu
This gives an error when building the docs.