aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-06-27fix escript archive symlinked across drivesLuis Rascão
real_path method used while prim loading archive files was not taking into account the fact that windows directory symlinks can be across different drives (eg. c:\tmp\test is a symlink to j:\tmp\test). when performing a path split the drive precedes the symlink, but that has be rewritten also since it's different. This issue never arises in Unix since obviously there are no drives
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 'mikpe/openfile-dont-use-undefined-statbuf' into maintMarcus Arendt
* mikpe/openfile-dont-use-undefined-statbuf: Fix efile_openfile() to handle stat() failure
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-03Merge branch 'lukas/erts/git_vsn_script_fix/OTP-11961' into maintLukas Larsson
* lukas/erts/git_vsn_script_fix/OTP-11961: erts: Fix git version script
2014-06-03erts: Fix git version scriptLukas Larsson
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-03Merge branch 'hb/dialyzer/correct_docs' into maintHans Bolinder
* hb/dialyzer/correct_docs: [dialyzer] Correct docs about options
2014-06-03[dialyzer] Correct docs about optionsHans Bolinder
2014-05-29Merge branch 'anders/diameter/17.1/OTP-11943' into maintAnders Svensson
* anders/diameter/17.1/OTP-11943: Update appup for OTP-11958: dictionary compilation
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-29Update appup for OTP-11958: dictionary compilationAnders Svensson
Modules: diameter_dict_util Not in the app file, no change required.
2014-05-28Merge branch 'sverk/etp-cp-fix' into maintSverker Eriksson
* sverk/etp-cp-fix: erts: Fix bug in gdb function etp-cp-1
2014-05-28erts: Fix bug in gdb function etp-cp-1Sverker Eriksson
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-11946, OTP-11936: 5014, Failed-AVP decodeAnders Svensson
Modules: diameter_codec, dictionary modules diameter_codec must be loaded last. No change required.
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 appup for OTP-11934: watchdog process leakAnders Svensson
Modules: diameter_service, diameter_watchdog No change required.
2014-05-27Updated OTP versionOTP-17.0.2Erlang/OTP
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-27Merge branch 'ia/inets/block-unblock/OTP-11914' into maint-17Erlang/OTP
* ia/inets/block-unblock/OTP-11914: inets: Correct distirbing mode for httpd:reload_config/2
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