| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/http_lib/http_transport.erl
lib/inets/src/inets_app/inets.appup.src
lib/inets/vsn.mk
lib/ssl/doc/src/notes.xml
lib/ssl/src/ssl.appup.src
lib/ssl/src/ssl.erl
lib/ssl/src/ssl_internal.hrl
lib/ssl/src/tls_connection.erl
lib/ssl/vsn.mk
|
|
Note that this is a fake merge. The bug fix changes files that
are no longer present in maint, and the bug will need to be fixed
in a different way.
* maint-r15:
Prepare release
PER, UPER: Fix encoding/decoding of open types greater than 16K
|
|
|
|
* fredrik/inets/ssl/fixup_log_alert_option/OTP-11259:
[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel added as option to inets conf file
|
|
added as option to inets conf file
|
|
|
|
* bjorn/asn1/fragmented-open-types/OTP-11223:
PER, UPER: Fix encoding/decoding of open types greater than 16K
|
|
|
|
* bmk/snmp/snmp4241_integration/r16:
[snmp/agent] Cleanup, renaming, appup, proper version and release notes
[snmp/agent] Local DB counter increment wrap error
SNMP/VACM: bugfix for vacmViewTreeFamilyMask
|
|
bmk/snmp/snmp4241_integration/r16
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
|
|
bmk/snmp/snmp4241_integration/r16
|
|
Add utility functions for checking view masks.
Code cleanup, function renaming and comment fix (%% instead of %).
Also updated the mask check in the vacm config file check function.
Finally, release notes and some cosmetic changes to the agent
config-file(s) user guide chapter.
|
|
The counter increment function in the local-db was incorrect.
It did not handle counter wrap correctly.
OTP-11192
|
|
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/vsn.mk
lib/ssh/doc/src/notes.xml
lib/ssh/src/ssh.appup.src
lib/ssh/src/ssh_connection_handler.erl
lib/ssh/vsn.mk
|
|
|
|
* fredrik/ssh/error_disconnect/OTP-11188:
ssh: version updates
ssh: fixed bad match failure when disconnect msg
|
|
* fredrik/inets/httpd_manager_reports/OTP-11185:
inets: version updates
inets: removed obsolete code
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* sverk/term_to_binary-memleak:
erts: Fix memory leak in term_to_binary/2 with compressed option
|
|
* raimo/race-in-prim_inet-close/OTP-10497:
Improve solution
|
|
|
|
into maint
* anders/diameter/vendor_specific_function_clause/OTP-11165:
Fix list-valued Vendor-Specific-Application-Id config
|
|
|
|
Commit f0a36c79 broke the handling of such configuration, resulting in a
function clause error in diameter_capx if the list was not of length 3,
and faulty extraction of application id's otherwise. Only record-valued
config was properly interpreted.
|
|
|
|
|
|
|
|
|
|
* rickard/+sfwi/OTP-11164:
erts: Add the +sfwi system flag
|
|
* sverk/crypto-upgrade-resource-bug:
crypto: Fix bug with takover of EC resource type
|
|
+sfwi Interval
Set scheduler forced wakeup interval. All run queues will be scanned
each Interval milliseconds. While there are sleeping schedulers in
the system, one scheduler will be woken for each non-empty run queue
found. An Interval of zero disables this feature, which also is the
default.
This feature has been introduced as a temporary workaround for lengthy
executing native code, and native code that do not bump reductions
properly in OTP. When these bugs have be fixed the +sfwi flag will
be removed.
|
|
enif_open_resource_type() must be called even during repeated loading
of same library. Otherwise the resource type will be deallocated
when the old module instance is purged.
|
|
* pan/happi/yield_in_term_to_binary:
Add testcase to stress extra_root
term_to_binary: Remove debug code and set production trap levels
Teach erl_gc:offset_rootset about extra_root
Teach external.c to handle reallocs before compression
Make all steps ofterm_to_binary work in chunks and yield
Make term_to_binary yield (trap).
OTP-11163
|
|
* anders/diameter/request_spawn/OTP-11060:
Minor doc fix
|
|
|
|
|
|
* anders/diameter/release/R16B01/OTP-11120:
vsn -> 1.4.2
Update appup for R16B01
Trailing whitespace and copyright fixes
Minor macro simplification
Move app/appsrc from src/base into src
|
|
* anders/diameter/request_spawn/OTP-11060:
Make spawn options for request processes configurable
|
|
* anders/diameter/peer_address_config/OTP-10893:
Let diameter_{tcp,sctp} be configured with permissible remote addresses
Fix diameter_{tcp,sctp} spec
Remove trailing whitespace
|
|
|
|
|
|
Tickets and corresponding runtime modules, in order merged:
OTP-9610 (distribution)
diameter
diameter_config
diameter_peer
diameter_service
diameter_traffic
diameter_service must precede diameter_peer.
OTP-10972 (app_not_configured)
diameter
diameter_config
diameter_lib
diameter_peer_fsm
diameter_watchdog
Load order is unimportant.
OTP-11017 (service_config)
diameter_config
OTP-10986 (address_config)
diameter_peer
diameter_peer_fsm
diameter_tcp
diameter_tcp must follow the others.
OTP-11019 (watchdog_leak)
diameter_service
OTP-11026 (avp_length_failure)
diameter_codec
OTP-11007 (avp_decode)
diameter_gen.hrl => diameter_gen_*
diameter_codec
diameter_traffic
diameter_traffic must precede diameter_gen_*.
OTP-11087 (missed_5001)
diameter_gen.hrl => diameter_gen_*
OTP-11115 (watchdog_function_clause)
diameter_watchdog
OTP-11050 (inband_security)
diameter_peer_fsm
diameter_capx
This order is required.
OTP-11045 (host_ip_address)
diameter_peer_fsm
OTP-11092 (5xxx_failed_avp)
diameter_traffic
OTP-11127 (one_failed_avp)
diameter_peer_fsm
OTP-10893 (peer_address_config)
diameter_peer
diameter_tcp
diameter_sctp
diameter_peer must precede the others.
OTP-11060 (request_spawn)
diameter_service
diameter_traffic
diameter_config
diameter
diameter_traffic should precede diameter_service, diameter_config
should follow.
Tickets without code:
OTP-10903 (examples_suite)
OTP-11014 (release_notes)
OTP-11051 (mkdir_race)
OTP-10914 (timetraps)
|
|
* rickard-sverker/carrier-migration/OTP-10279:
erts: Fix warning
erts: Fix management of redirected carrier to deallocate
|
|
That is, for the process that's spawned for each incoming Diameter
request message.
|
|
OTP-11159
|
