aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2014-06-11Merge branch 'nox/fix-perms' into maintHenrik Nord
* nox/fix-perms: Fix permissions of some files in the repository
2014-06-11Merge branch 'qrilka/ssl-seconds-in-24h' into maintHenrik Nord
* qrilka/ssl-seconds-in-24h: ssl: Fix incorrect number of seconds in 24 hours
2014-06-11Merge branch 'telsacolton/snmp_test_manager_badmatch_pid' into maintHenrik Nord
* telsacolton/snmp_test_manager_badmatch_pid: Fix badmatch error when trying to start_link an snmp_test_manager Edit line 59 to remove "mgr" key from #State record. Edit line 133 to expect ok instead of {ok, Pid} from snmpm:start_link . Edit line 136 not to reference Pid variable which was removed above.
2014-06-11Merge branch 'pguyot/fix_srp' into maintHenrik Nord
* pguyot/fix_srp: Fix bug in SRP implementation
2014-06-06Merge branch 'rickard/invalid_bitstr_bifs/OTP-11942' into maintRickard Green
* rickard/invalid_bitstr_bifs/OTP-11942: Remove invalid 'bitstr' exports in erlang.erl
2014-06-06Merge branch 'rickard/binary_to_term_error/OTP-11931' into maintRickard Green
* rickard/binary_to_term_error/OTP-11931: Replace erlang:binary_to_term() Erlang wrappers Conflicts: erts/preloaded/ebin/erts_internal.beam
2014-06-05Remove invalid 'bitstr' exports in erlang.erlRickard Green
The dummy BIF exports 'erlang:bitstr_to_list/1' and 'erlang:list_to_bitstr/1' seem to have appeared as a result of a copy-paste error and are now removed.
2014-06-05Replace erlang:binary_to_term() Erlang wrappersRickard Green
Replace the 'erlang:binary_to_term/1' and 'erlang:binary_to_term/2' Erlang wrappers taking care of failure after yield with management of this in the hidden yield BIF.
2014-06-05Merge branch 'bjorn/kernel/stick-preloaded/OTP-11913' into maintBjörn Gustavsson
* bjorn/kernel/stick-preloaded/OTP-11913: Make pre-loaded modules permanently sticky application_SUITE: Clean up the code after the test is done Teach code:del_path/1 to ignore superfluous slashes
2014-06-05Merge branch 'ia/ssl/dumb-clients/OTP-11969' into maintIngela Anderton Andin
* ia/ssl/dumb-clients/OTP-11969: ssl: Avoid creating a huge session table
2014-06-04Make pre-loaded modules permanently stickyBjörn Gustavsson
Modules in the kernel, stdlib, and compiler applications are by default "sticky", meaning that the code server will refuse to re-load them. The pre-loaded modules (those that are part of the run-time system itself, such as 'erlang') are, however, not sticky. They used to be sticky a long time ago when the pre-loaded modules were part of the kernel application. Now they are part of the erts application. Since re-loading a pre-loaded module can be catastrophic (especially re-loading the 'erlang' module), the pre-loaded modules must be sticky. Furthermore, it should not be allowed to unstick them. The sticky_dir/1 test case in code_SUITE is never actually run and is broken. Rewrite it.
2014-06-04Merge branch 'sverk/crypto-leaking-hmac/OTP-11953' into maintSverker Eriksson
* sverk/crypto-leaking-hmac/OTP-11953: crypto: Fix memory leak in some error cases crypto: Fix memory leak in hmac stream functions
2014-06-04Merge branch 'scrapinghub/stream_body_with_no_content_length' into maintMarcus Arendt
* scrapinghub/stream_body_with_no_content_length: inets: Fix HTTP 1.0 body end on closed connection
2014-06-04Merge branch 'RoadRunnr/ssl/fix-tests' into maintMarcus Arendt
* RoadRunnr/ssl/fix-tests: SSL: fix OpenSSL known renegotiation bug detection SSL: in tests, filter ssl client ciphers for version compatibility
2014-06-04Merge branch 'fenek/fix/vstudio_macro' into maintMarcus Arendt
* fenek/fix/vstudio_macro: Add Visual Studio macros to erl_driver.h and ei.h
2014-06-04Merge branch 'ia/ssl/default-ciphers/OTP-11966' into maintIngela Anderton Andin
* ia/ssl/default-ciphers/OTP-11966: ssl: Workaround that gen_fsm does not call CB:format_status when CB:terminate crashes. SSL: always filter the full list of supported ciphers against the supported algorithms ssl: Filter default ciphers for supported Crypto algorihms
2014-06-03ssl: Workaround that gen_fsm does not call CB:format_status when CB:terminateIngela Anderton Andin
crashes.
2014-06-03SSL: always filter the full list of supported ciphers against the supported ↵Andreas Schultz
algorithms With the addition of more ciphers that are not supported in all configurations, using a manually prefiltered cipher list (e.g. EC vs. non-EC ciphers) becomes to complex. Replace the manual split with ssl_cipher:filter_suites/1 in all places. Conflicts: lib/ssl/src/ssl.erl lib/ssl/src/tls_v1.erl
2014-06-03Merge branch 'ia/ssl/prep-release' into maintIngela Anderton Andin
* ia/ssl/prep-release: ssl: Prepare for release
2014-06-03[dialyzer] Correct docs about optionsHans Bolinder
2014-05-29Merge branch 'anders/diameter/dictionaries/OTP-11958' into maintAnders Svensson
* anders/diameter/dictionaries/OTP-11958: Fix broken check for undefined AVPs in @codec and @custom_types Add @codecs and @custom_types tests to compiler suite
2014-05-29Fix broken check for undefined AVPs in @codec and @custom_typesAnders Svensson
Instead of detecting the error, code generation failed when attempting to lookup the type of an undefined AVP.
2014-05-29Add @codecs and @custom_types tests to compiler suiteAnders Svensson
Dictionary compilation fails to detect undefined AVPs in these sections.
2014-05-28ssl: Fix incorrect number of seconds in 24 hoursKirill Zaborsky
24 hours in seconds should be equal to 86400 and 86400000 in milliseconds
2014-05-28SSL: fix OpenSSL known renegotiation bug detectionAndreas Schultz
The OpenSSL detection match would actually consider all 1.0.1 versions as affected when really only 1.0.1 - 1.0.1c are.
2014-05-28SSL: in tests, filter ssl client ciphers for version compatibilityAndreas Schultz
Some psk and some not yet supported anonymous suites are only supported with TLS version >= 1.2. This adds them to the tests and makes sure that they are not tested on TLS versions that do not support them.
2014-05-28Merge branch 'siri/cdv-timer-reg-proc/OTP-11919' into maintSiri Hansen
* siri/cdv-timer-reg-proc/OTP-11919: [cdv] Allow registered name as owner of timer in crashdump
2014-05-28ssl: Filter default ciphers for supported Crypto algorihmsIngela Anderton Andin
2014-05-28ssl: Prepare for releaseIngela Anderton Andin
2014-05-28Merge branch 'ia/ssl/improved-options-handling/OTP-11950' into maintIngela Anderton Andin
* ia/ssl/improved-options-handling/OTP-11950: ssl: Correct test SUITE ssl: Add format_status function to ssl connection process inets: Correct httpc_SUITE ssl: Add ssl options to listen options tracker ssl: Move init
2014-05-28Merge branch 'anders/diameter/17.1/OTP-11943' into maintAnders Svensson
* anders/diameter/17.1/OTP-11943: Update appup for OTP-11946, OTP-11936: 5014, Failed-AVP decode Update appup for OTP-11938: terminate watchdog after DPR reception Update appup for OTP-11721: log and counter hardening Update appup for OTP-11937: counters Update appup for OTP-11901: diameter_sctp function_clause Update appup for OTP-11934: watchdog process leak Update appup for OTP-11893: request table leak Update appup for OTP-11891: result code counters for CEA/DWA/DPA vsn -> 1.7 Fix broken release note for diameter-1.4.4
2014-05-28Merge branch 'anders/diameter/hardening/OTP-11721' into maintAnders Svensson
* anders/diameter/hardening/OTP-11721: Change answer_errors default from report to discard
2014-05-28Update appup for OTP-11938: terminate watchdog after DPR receptionAnders Svensson
Modules: diameter_watchdog, diameter_peer_fsm diameter_watchdog must be loaded first.
2014-05-28Update appup for OTP-11721: log and counter hardeningAnders Svensson
Modules: diameter_codec, diameter_peer_fsm, diameter_watchdog, diameter_traffic, diameter_service, diameter_lib, dictionary modules diameter_lib and diameter_traffic (in that order) must be loaded first. diameter_codec last must be loaded before diameter_peer_fsm and diameter_watchdog.
2014-05-27Merge branch 'maint-17' into maintIngela Anderton Andin
Conflicts: OTP_VERSION lib/ssh/test/ssh_basic_SUITE.erl lib/ssh/vsn.mk
2014-05-27[cdv] Allow registered name as owner of timer in crashdumpSiri Hansen
crashdump_viewer would crash if the owner of a timer was specified as the process' regisered name. This has been corrected.
2014-05-27Update appup for OTP-11937: countersAnders Svensson
Modules: diameter_peer_fsm, diameter_watchdog, diameter_codec, diameter_traffic diameter_traffic must be loaded first.
2014-05-27Update appup for OTP-11901: diameter_sctp function_clauseAnders Svensson
2014-05-27Update release notesErlang/OTP
2014-05-27Merge branch 'hans/ssh/patch-17.0.2' into maint-17Erlang/OTP
* hans/ssh/patch-17.0.2: ssh: Prepare for release ssh: Use correct timeout value for the connection timeout ssh: Add max_session parameter to ssh:daemon
2014-05-27Merge branch 'ia/inets/prep' into maint-17Erlang/OTP
* ia/inets/prep: inets: Prepare for release
2014-05-27Merge branch 'ia/inets/maint-17/string-lengths/OTP-11925' into maint-17Erlang/OTP
* ia/inets/maint-17/string-lengths/OTP-11925: inets: httpd - Behave well on not so long but wrong request lines inets: httpc - update test suite framwork to adopt to change in httpd inets: httpd - Reject incorrect large request lines early
2014-05-27inets: Correct distirbing mode for httpd:reload_config/2Ingela Anderton Andin
config_reload tests are not enough to test httpd "block/unblock" used by config_reload, so renable some test cases in the old_httpd_SUITE after making them work with the new code. Should be cleaned up and moved to httpd_SUITE.
2014-05-27Update appup for OTP-11893: request table leakAnders Svensson
Modules: diameter_service
2014-05-27Update appup for OTP-11891: result code counters for CEA/DWA/DPAAnders Svensson
Modules: diameter_traffic, diameter_peer_fsm, diameter_watchdog diameter_traffic must be loaded first.
2014-05-27vsn -> 1.7Anders Svensson
2014-05-27Fix broken release note for diameter-1.4.4Anders Svensson
Those were bug fixes, not known issues.
2014-05-27ssl: Correct test SUITEIngela Anderton Andin
2014-05-27ssl: Add format_status function to ssl connection processIngela Anderton Andin
2014-05-27Change answer_errors default from report to discardAnders Svensson
In the same vein as commit 00584303, to avoid logging traffic-related happenings. Not that the value in diameter.hrl is just documentation: the value is set explicitly when diameter:start_service/2 creates diameter_app records.