aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2015-08-13Merge branch 'maint'Zandra Hird
2015-08-13Merge branch 'sstrigler/fix-port-timeout' into maintZandra Hird
OTP-12935 * sstrigler/fix-port-timeout: add test for odbc port_timeout add doc for odbc port_timeout introduce odbc port_timeout
2015-08-13Merge branch 'maint'Zandra Hird
2015-08-12Merge branch 'toraritte/patch-1' into maintZandra Hird
* toraritte/patch-1: Fix function reference (no first/2 in ets)
2015-08-12Merge branch 'ericmj/patch-1' into maintZandra Hird
* ericmj/patch-1: Fix formatting of depth option
2015-08-06Merge branch 'maint'Hans Nilsson
* maint: ssh: announce dh-group-exchange ssh: document new options in doc/ssh.xml ssh: more dh_gex test cases ssh: options 'dh_gex_groups' and 'dh_gex_limits'
2015-08-06Merge branch 'maint'Hans Nilsson
* maint: ssh: diffie-hellman-group14-sha1
2015-08-05ssh: announce dh-group-exchangeHans Nilsson
2015-08-05ssh: document new options in doc/ssh.xmlHans Nilsson
2015-08-05ssh: more dh_gex test casesHans Nilsson
2015-08-05ssh: options 'dh_gex_groups' and 'dh_gex_limits'Hans Nilsson
2015-08-05ssh: diffie-hellman-group14-sha1Hans Nilsson
2015-08-04Merge branch 'maint'Hans Nilsson
* maint: ssh: added more groups for gex ssh: rm ssh_math and use crypto:compute_key instead ssh: filter algs unknown to crypto (except pk) ssh: add test group ssh: Add experimental 'diffie-hellman-group-exchange-sha256 support ssh: Repair/add experimental diffie-hellman-group-exchange-sha1 support
2015-08-03ssh: added more groups for gexHans Nilsson
2015-08-03ssh: rm ssh_math and use crypto:compute_key insteadHans Nilsson
2015-08-03ssh: filter algs unknown to crypto (except pk)Hans Nilsson
2015-08-03ssh: add test groupHans Nilsson
2015-08-03ssh: Add experimental 'diffie-hellman-group-exchange-sha256 supportHans Nilsson
DO NOT USE IN PRODUCTION!!! It is not enabled by default, but may be enabled with the option {preferred_algorithms, [{kex, ['diffie-hellman-group-exchange-sha256']}]}
2015-08-03ssh: Repair/add experimental diffie-hellman-group-exchange-sha1 supportHans Nilsson
DO NOT USE IN PRODUCTION!!! This is a bug fixing of the previously partly impelmented kex algorithm. There are more things to do, for example genrate/select better g,p pair obeying the min||n||max request. It is not enabled by default, but may be enabled with the option {preferred_algorithms, [{kex, ['diffie-hellman-group-exchange-sha1']}]}
2015-07-31Merge branch 'maint'Zandra Hird
* maint: inets: cancel for handler with no requests
2015-07-30Merge branch 'emacstheviking/maint'Zandra Hird
* emacstheviking/maint: Increased left-nav width for readability
2015-07-16Increased left-nav width for readabilitySean Charles
It just makes it easier to read stuff. For example, gen_server functions are now totally visible, no more guessing.
2015-07-16inets: cancel for handler with no requestsKirilll Zaborsky
httpc_handler should react properly to cancel requests even when the request to be cancelled was already finished but httpc_manager did not get notified about that yet
2015-07-14Fix function reference (no first/2 in ets)Attila Gulyas
2015-07-14Merge branch 'lukas/ose/remove/OTP-12573'Lukas Larsson
* lukas/ose/remove/OTP-12573: Remove OSE from erl_interface ose: Remove all code related to the OSE port
2015-07-10Remove OSE from erl_interfaceLukas Larsson
2015-07-10ose: Remove all code related to the OSE portLukas Larsson
The OSE port is no longer supported and this commit removed it and any changes related to it. The things that were general improvements have been left in the code.
2015-07-09Merge branch 'maint'Zandra Hird
2015-07-09Fix small typoConstantin Rack
2015-07-09Merge branch 'maint'Zandra Hird
2015-07-09Merge branch 'redvers/public_key_docfix' into maintZandra Hird
* redvers/public_key_docfix: Updated documentation to match implementation
2015-07-08Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release Fix calculation of end time Prefer monotonic time that stop during suspend Avoid unnecessary copying of data when retrieving corrected monotonic time Add the --enable-gettimeofday-as-os-system-time configure switch Conflicts: OTP_VERSION erts/vsn.mk
2015-07-08Merge branch 'maint-18' into maintRickard Green
* maint-18: Updated OTP version Prepare release Fix calculation of end time Prefer monotonic time that stop during suspend Avoid unnecessary copying of data when retrieving corrected monotonic time Add the --enable-gettimeofday-as-os-system-time configure switch
2015-07-08Prepare releaseErlang/OTP
2015-07-08Merge branch 'rickard/trace-file-eintr-bug/OTP-12890' into maint-18Erlang/OTP
* rickard/trace-file-eintr-bug/OTP-12890: Handle EINTR in trace_file_drv
2015-07-08Merge branch 'maint'Dan Gudmundsson
* maint: wx: Add event callback fastpath wx: Event callbacks could hang wx application temporary wx: Make wxLANGUAGE_ variable wx: Send wxWdigets assert to error logger wx: Add mouse_capture_lost event wx: Fix code generator
2015-07-08Merge branch 'dgud/wx/send-asserts-to-erl' into maintDan Gudmundsson
* dgud/wx/send-asserts-to-erl: wx: Add event callback fastpath wx: Event callbacks could hang wx application temporary wx: Make wxLANGUAGE_ variable wx: Send wxWdigets assert to error logger wx: Add mouse_capture_lost event wx: Fix code generator
2015-07-07Merge branch 'maint'Zandra Hird
2015-07-07Merge branch 'maint-17' into maintZandra Hird
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/runtime_tools/doc/src/notes.xml lib/runtime_tools/vsn.mk otp_versions.table
2015-07-07wx: Add event callback fastpathDan Gudmundsson
Avoids spawn but can deadlock
2015-07-06Prepare releaseErlang/OTP
2015-07-06Handle EINTR in trace_file_drvRickard Green
2015-07-05Merge branch 'maint'Hans Nilsson
* maint: ssh: be more generous about disconnect expects ssh: add disjunction to ssh_trpt_test_lib:match
2015-07-04ssh: be more generous about disconnect expectsHans Nilsson
2015-07-04ssh: add disjunction to ssh_trpt_test_lib:matchHans Nilsson
2015-07-03Merge branch 'maint'Björn-Egil Dahlberg
2015-07-03Merge branch 'egil/update-gitgnore' into maintBjörn-Egil Dahlberg
2015-07-03mnesia: Update gitignoreBjörn-Egil Dahlberg
2015-07-03Merge branch 'maint'Hans Nilsson
* maint: ssh: testcases for no common algorithms in key exchange
2015-07-03Merge branch 'hans/ssh/no_common_algs/OTP-11531' into maintHans Nilsson
* hans/ssh/no_common_algs/OTP-11531: ssh: testcases for no common algorithms in key exchange