aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2015-06-05Merge branch 'scrapinghub/proper_stop_on_handling_keepalive_queue'Zandra Hird
* scrapinghub/proper_stop_on_handling_keepalive_queue: inets: proper stop for httpc_handler K-A queue failure OTP-12803
2015-06-05observer: cdv add scheduler informationDan Gudmundsson
New info in 18.
2015-06-05observer: cdv add more ets informationDan Gudmundsson
Info available from erl-18 nodes.
2015-06-05Merge branch 'bjorn/kernel/cuddle-with-tests'Björn Gustavsson
* bjorn/kernel/cuddle-with-tests: Clean up rpc_SUITE:call_benchmark/1 Eliminate use of erlang:now/0 for generating random numbers Eliminate use of erlang:now/0 for measuring time Eliminate use of erlang:now/0 for generating unique node names
2015-06-05Clean up rpc_SUITE:call_benchmark/1Björn Gustavsson
The call_benchmark/1 test case is supposed to return a comment about the number of RPC calls per second, but the return value from the function that produces the comment (do_call_benchmark/4) is ignored. The test case is essentially useless except as a smoke test. Simplify the test case and correct the showing of the number of RPC calls per second, as well as eliminate the use of erlang:now/0.
2015-06-04Merge branch 'zhird/leoliu/dbg_wx_trace/arg-to-gui_enable_updown'Zandra Hird
* zhird/leoliu/dbg_wx_trace/arg-to-gui_enable_updown: Fix argument to gui_enable_updown in dbg_wx_trace:init/6
2015-06-04Merge branch 'dw/error_on_nan_inf/OTP-12801'Björn-Egil Dahlberg
* dw/error_on_nan_inf/OTP-12801: erl_interface: Move math.h include after eidef.h erl_interface: Remove configure test for isfinite erl_interface: Surround isfinite with HAVE_ISFINITE conditional erl_interface: Move isfinite definition to header erl_interface: Use isfinite instead of fpclassify erl_interface: Document non finite encoding returns Do not accept Nan and Infinity values Fix one-letter typo
2015-06-04Merge branch 'henrik/fix-inets-tests'Henrik Nord
* henrik/fix-inets-tests: inets: correct the calls in start_apps
2015-06-04Merge branch 'egil/cuddle-tests'Björn-Egil Dahlberg
* egil/cuddle-tests: erts: Remove remaining ?line macros in trace_meta_SUITE erts: Relax trace_meta_SUITE:on_and_off_test/1 erts: Remove ?line macro in trace_meta_SUITE:on_and_off_test/1 kernel: Remove remaining ?line macros in gen_tcp_misc_SUITE kernel: Relax gen_tcp_misc_SUITE don't wait for timeout kernel: Relax test gen_tcp_misc_SUITE:wrapping_oct/1
2015-06-04kernel: Remove remaining ?line macros in gen_tcp_misc_SUITEBjörn-Egil Dahlberg
Also, fixup some confusing indentations. This commit only contains whitespace changes and removal of ?line macros.
2015-06-04inets: correct the calls in start_appsHenrik Nord
2015-06-04Merge branch 'bjorn/compiler/spurious-warning'Björn Gustavsson
* bjorn/compiler/spurious-warning: sys_core_fold: Eliminate warnings for unused terms in effect context sys_core_fold: Eliminate warnings for unused terms
2015-06-03Merge branch 'kostis/llvm-now'Henrik Nord
* kostis/llvm-now: Replace call to erlang:now() with appropriate call to 18.0 BIF
2015-06-03Merge branch 'scrapinghub/async-typo'Henrik Nord
* scrapinghub/async-typo: Typo 'asynchroneous' fix
2015-06-03Merge branch 'jh/freebsdcpu/OTP-12796'Björn-Egil Dahlberg
* jh/freebsdcpu/OTP-12796: os_mon: Comply with C89 standard os_mon: Update docs for FreeBSD os_mon: Implement cpu_sup:util/0,1 for FreeBSD
2015-06-02Merge branch 'nybek/fix_gen_tcp_shutdown'Zandra Hird
OTP-12797
2015-06-02erl_interface: Move math.h include after eidef.hBjörn-Egil Dahlberg
2015-06-02erl_interface: Remove configure test for isfiniteBjörn-Egil Dahlberg
2015-06-02erl_interface: Surround isfinite with HAVE_ISFINITE conditionalBjörn-Egil Dahlberg
2015-06-02erl_interface: Move isfinite definition to headerBjörn-Egil Dahlberg
2015-06-02Merge branch 'josevalim/jv-annotate-form-type'Henrik Nord
* josevalim/jv-annotate-form-type: Annotate used types in erl_lint OTP-12800
2015-06-02Merge branch 'tombriden/handle_ssl_error'Henrik Nord
* tombriden/handle_ssl_error: TLS Dist: Handle ssl_error and close ssl socket OTP-12799
2015-06-02Merge branch 'weiss/propagate-setopt-error'Henrik Nord
* weiss/propagate-setopt-error: Don't throw exception on prim_inet:setopt/3 error OTP-12798
2015-06-02erl_interface: Use isfinite instead of fpclassifyBjörn-Egil Dahlberg
2015-06-02Merge branch 'zandra/revert/saleyn/eunit'Zandra Hird
2015-06-02Merge branch 'richcarl/syntax_tools/add-merl/OTP-12769'Björn Gustavsson
* richcarl/syntax_tools/add-merl/OTP-12769: syntax_tools app file: Update dependencies Makefile: Eliminate crash when building with native libs
2015-06-02restore broken fileHenrik Nord
2015-06-02os_mon: Comply with C89 standardBjörn-Egil Dahlberg
2015-06-02correct merge conflictHenrik Nord
2015-06-02Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk lib/ssh/src/ssh.erl lib/ssh/vsn.mk lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk
2015-06-01inets: proper stop for httpc_handler K-A queue failureKirilll Zaborsky
httpc_handler should respond with proper {stop, Reason, State} message when sending request from keep-alive queue fails
2015-06-01Update release notesErlang/OTP
2015-06-01Merge branch 'hans/ssh/codenomicon_degradation/OTP-12784' into maint-17Erlang/OTP
* hans/ssh/codenomicon_degradation/OTP-12784: ssh: update ssh version ssh: Plain text message returned for invalid version exchange ssh: Implement keyboard_interactive on server side ssh: Check e and f parameters in kexdh ssh: Set max num algoritms in msg_kexinit negotiation
2015-06-01Merge branch 'ia/ssl/crypto-bad-input/OTP-12783' into maint-17Erlang/OTP
* ia/ssl/crypto-bad-input/OTP-12783: ssl: Prepare for release ssl: Correct handling of bad input to premaster_secret calculation
2015-06-01Merge branch 'ia/ssh/recvbuf/OTP-12782' into maint-17Erlang/OTP
* ia/ssh/recvbuf/OTP-12782: ssh: handle that inet:getopts(Socket, [recbuf]) may return {ok, []}
2015-05-30Merge branch 'maint'Anders Svensson
2015-05-29ssl: Prepare for releaseIngela Anderton Andin
2015-05-29ssl: Correct handling of bad input to premaster_secret calculationIngela Anderton Andin
alert records needs to be thrown from ssl_handshake:premaster_secret/[2/3] so that operations will end up in the catch clause of the invokation of certify_client_key_exchange/3 in ssl_connection.erl, and hence terminate gracefully and not continue to try and calculate the master secret with invalid inputs and crash.
2015-05-29ssh: update ssh versionHans
2015-05-29ssh: Plain text message returned for invalid version exchangeHans
This is how OpenSSH does. The bytes returned will be put on the user's tty, so it is better with text than a ssh_msg_disconnect
2015-05-29ssh: Implement keyboard_interactive on server sideHans
2015-05-29ssh: Check e and f parameters in kexdhHans Nilsson
rfc 4253 says in section 8 that: "Values of 'e' or 'f' that are not in the range [1, p-1] MUST NOT be sent or accepted by either side. If this condition is violated, the key exchange fails." This commit implements the reception check.
2015-05-29ssh: Set max num algoritms in msg_kexinit negotiationHans
This is to prevent some dos-attac scenarios. The limit is hard-coded.
2015-05-29ssh: handle that inet:getopts(Socket, [recbuf]) may return {ok, []}Ingela Anderton Andin
If something bad happens and the socket is closed the call inet:getopts(Socket, [recbuf]) may return {ok, []}. We want to treat this as a fatal error and terminate gracefully. The same goes for the case that inet:getopts returns {error, Reason} that was not handled either.
2015-05-29inets: Prepare for releaseIngela Anderton Andin
2015-05-29inets: Add customize optionIngela Anderton Andin
Many HTTP headers are optional, and it could be desirable for the server to filter and maybe even alter them without replacing the mod_* modules that generate/process them. Add new behaviour httpd_custom_api with default implementation in httpd_custom.erl. Add behaviour module in 18 as then we can specify optional callbacks.
2015-05-29Merge branch 'kostis/cerl_pmatch'Zandra Hird
* kostis/cerl_pmatch: Allow use of complete interface of cerl_pmatch module OTP-12794
2015-05-29Merge branch 'ethercrow/maint'Zandra Hird
* ethercrow/maint: Make cpu_sup:util/0 spec lie less
2015-05-29Merge branch 'fishcakez/supervisor_ignore'Zandra Hird
* fishcakez/supervisor_ignore: Don't store child that returns ignore in simple supervisor OTP-12793
2015-05-29Update release notesErlang/OTP