aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-03-21Merge branch 'maint-r15' into lars/orber/corbaloc-bug-r16-version/OTP-10675Lars Thorsen
* maint-r15: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-19Prepare releaseErlang/OTP
2013-03-19Merge branch 'anders/diameter/vendor_specific_app_id/OTP-10942' into maint-r16Anders Svensson
* anders/diameter/vendor_specific_app_id/OTP-10942: Minor capx suite fix Update appup, vsn -> 1.4.1.1 Deal with RFC 6733 change to Vendor-Specific-Application-Id
2013-03-19Merge branch 'anders/diameter/reopen_abuse/OTP-10898' into maint-r16Anders Svensson
* anders/diameter/reopen_abuse/OTP-10898: Update appup Tweak okay -> suspect config Add testcases for watchdog_config Rework watchdog suite to remove most timing dependencies Rework stats to avoid concurrent read and write Minor spec fix Add transport_opt() watchdog_config
2013-03-19Prepare releaseErlang/OTP
2013-03-19Merge branch 'fredrik/ssh/timing_rekey/OTP-10940' into maint-r16Anders Svensson
* fredrik/ssh/timing_rekey/OTP-10940: Removed timing rekeying
2013-03-19Minor capx suite fixAnders Svensson
2013-03-18Update appup, vsn -> 1.4.1.1Anders Svensson
2013-03-18Deal with RFC 6733 change to Vendor-Specific-Application-IdAnders Svensson
RFC 6733 has changed the arity of Vendor-Id in this Grouped AVP, from 1* in RFC 3588 to 1 in RFC 6773. This impacts the generated dictionary modules: Vendor-Id is expected to be list-valued in the 3588 dictionary, integer-valued in the 6733 dictionary. This, in turn, breaks the independence of capabilities configuration on a service or transport from the dictionary that will be used to encode an outgoing CER or CEA. This commit fixes this by massaging any Vendor-Specific-Application-Id config as appropriate when constructing CER or CEA for a given dictionary.
2013-03-18Update appupAnders Svensson
2013-03-18Merge branch 'lars/orber/corbaloc-bug/OTP-10675' into maint-r15Erlang/OTP
* lars/orber/corbaloc-bug/OTP-10675: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-18[orber] Fix bug in corbaloc/corbaname over sslLars Thorsen
2013-03-14Removed timing rekeyingFredrik Gustafsson
2013-03-13Prepare releaseErlang/OTP
2013-03-13Merge branch 'bjorn/asn1/per-decode/OTP-10916' into maint-r16Erlang/OTP
* bjorn/asn1/per-decode/OTP-10916: PER: Ensure that the complete encoding is at least one byte PER/UPER: Correct decoding of ENUMERATEDs with a single value
2013-03-12Tweak okay -> suspect configAnders Svensson
Make it just a number of timeouts, without a new DWR being sent.
2013-03-12Add testcases for watchdog_configAnders Svensson
2013-03-12PER: Ensure that the complete encoding is at least one byteBjörn Gustavsson
If the encoding is empty (i.e. if a top-level type is single-valued and therefore not encoding), the result should be a single zero byte.
2013-03-08Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16Erlang/OTP
* fredrik/ssh/fix-rekeying/OTP-10911: Fixed appup for 2.1.5 Conflicts: lib/ssh/src/ssh.appup.src
2013-03-08Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into ↵Erlang/OTP
maint-r16 * ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714: ssh: Prepare for upcoming release ssh: Test and enhance handling of nonexistent subsystem Prepare release Fixed rekeying initiation and secured testcase
2013-03-08Merge branch 'sverk/erl_interface-trailing-enum-comma' into maint-r16Erlang/OTP
* sverk/erl_interface-trailing-enum-comma: erl_interface: Remove superfluous comma in enum erlang_char_encoding
2013-03-08ssh: Prepare for upcoming releaseIngela Anderton Andin
Note: If more things are added before the next releas the appup will need more updates.
2013-03-08ssh: Test and enhance handling of nonexistent subsystemIngela Anderton Andin
2013-03-08Fixed appup for 2.1.5Fredrik Gustafsson
2013-03-08PER/UPER: Correct decoding of ENUMERATEDs with a single valueBjörn Gustavsson
An ENUMERATED with as single value is not encoded. The decoder incorrectly assumed that it was encoded in one bit.
2013-03-08Prepare releaseErlang/OTP
2013-03-08Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16Erlang/OTP
* fredrik/ssh/fix-rekeying/OTP-10911: Fixed rekeying initiation and secured testcase
2013-03-08Merge branch 'sverk/erl_interface-trailing-enum-comma' into maint-r16Erlang/OTP
* sverk/erl_interface-trailing-enum-comma: erl_interface: Remove superfluous comma in enum erlang_char_encoding
2013-03-08Fixed rekeying initiation and secured testcaseFredrik Gustafsson
2013-03-04Rework watchdog suite to remove most timing dependenciesAnders Svensson
Count watchdog messages instead when this is an alternative.
2013-03-04Rework stats to avoid concurrent read and writeAnders Svensson
Counters read by diameter:service_info(SvcName, transport) can be selected at the same time as the diameter_stats server is folding them into another key, possibly resulting in inaccurate values. Have diameter_stats select from the server process to avoid this and add diameter_stats:sum/1 to sum values from all contributors on a given term.
2013-03-04Minor spec fixAnders Svensson
2013-03-04Add transport_opt() watchdog_configAnders Svensson
To make the number of watchdogs sent before the transitions REOPEN -> OKAY and OKAY -> SUSPECT configurable. Using anything other then the default config is non-standard and should only be used for test.
2013-02-27erl_interface: Remove superfluous comma in enum erlang_char_encodingSverker Eriksson
2013-02-25Prepare releaseOTP_R16BErlang/OTP
2013-02-25Merge branch 'kostis/hipe-icode-range-bug'Sverker Eriksson
* kostis/hipe-icode-range-bug: Fix bug related to the handling of is_number/1 by the range analysis Clean up and homogenize text messages for options OTP-10897
2013-02-25Merge branch 'sverk/halfword-loading-crash'Sverker Eriksson
* sverk/halfword-loading-crash: erts: Fix crash on halfword and code_SUITE:big_boot_embedded OTP-10896
2013-02-25Merge branch 'lukas/erts/add_ERL_MAX_PORTS_env/OTP-10895'Lukas Larsson
* lukas/erts/add_ERL_MAX_PORTS_env/OTP-10895: Undo removal of ERL_MAX_PORTS os variable
2013-02-25Merge branch 'lukas/erts/default_ports_win32/OTP-10892'Lukas Larsson
* lukas/erts/default_ports_win32/OTP-10892: Update to work with new default windows max ports Set default max ports on win32 to 8192
2013-02-25erts: Make vxworks buildBjörn-Egil Dahlberg
2013-02-25Update to work with new default windows max portsLukas Larsson
2013-02-25Fix bug related to the handling of is_number/1 by the range analysisKostis Sagonas
The following module produced erroneous results when compiled with HiPE: -module(a). -export([foo/1]). foo(X) when is_number(X) -> is_integer(X). Running: 1> c(a). 2> a:foo(0). true 3> hipe:c(a). 4> a:foo(0). false % *** WRONG *** The problem was that the 'number' case for the `hipe_icode:type_test/1` was going to the default case where the argument was determined as being something other than an integer. Thanks to Sebastian Egner and Johannes Weißl for bringing the bug into attention. Fixed on the day it was reported.
2013-02-25Clean up and homogenize text messages for optionsKostis Sagonas
2013-02-25Undo removal of ERL_MAX_PORTS os variableLukas Larsson
2013-02-25Set default max ports on win32 to 8192Lukas Larsson
2013-02-25erts: Fix crash on halfword and code_SUITE:big_boot_embeddedSverker Eriksson
2013-02-23Merge branch 'anders/diameter/SoC/OTP-10688'Anders Svensson
* anders/diameter/SoC/OTP-10688: Add RFC 6733 commentary to SoC chapter Add RFC 6737 Capabilities Update dictionary Remove cruft from doc Makefile
2013-02-23Merge branch 'rickard/epmd-prot-doc/OTP-10872'Rickard Green
* rickard/epmd-prot-doc/OTP-10872: Add info about UTF-8 encoding of nodename
2013-02-23Merge branch 'rickard/win-drv-bugfix/OTP-10803'Rickard Green
* rickard/win-drv-bugfix/OTP-10803: Fix close_active_handle() properly
2013-02-22Merge branch 'egil/win-efile-bugfix/OTP-10890'Björn-Egil Dahlberg
* egil/win-efile-bugfix/OTP-10890: erts: Use correct type for ReadFile bytes read