Age | Commit message (Collapse) | Author |
|
* sverker/crypto-openssl.0.9.8-PPC/OTP-9603:
[ssl] Step version for patch 1178
Touch crypto to provoke patch release (again)
|
|
Conflicts:
erts/doc/src/notes.xml
erts/emulator/drivers/common/inet_drv.c
erts/vsn.mk
lib/kernel/test/gen_sctp_SUITE.erl
|
|
No source change. Building with dynamic linking towards OpenSSL v0.9.8
|
|
|
|
|
|
* sverker/remove-static-ssl-linking/OTP-9566:
crypto: touch Makefile to provoke patch release
Change static link test of ssl to dynamic
Remove static ssl linking in crypto for otp_build
|
|
|
|
Only used for commercial builds
|
|
|
|
|
|
* raimo/sctp-getsetopts/OTP-9544:
erts,kernel: Bugfix - read SCTP socket options from right protocol layer
erts: Fix bug SCTP send can only be called from controlling process
|
|
Socket options 'sndbuf', 'recbuf' and 'linger were read from
the SCTP protocol layer instead of from the socket protocol layer.
Conflicts:
lib/kernel/test/gen_sctp_SUITE.erl
|
|
Conflicts:
lib/kernel/test/gen_sctp_SUITE.erl
|
|
|
|
maint-r13
* bmk/inets/httpd/cross_site_scripting_attacks/OTP-9535:
Updated http-server to make sure URLs in error-messages are URL-encoded. Added support in http-client to use URL-encoding. Also added the missing include directory for the inets application.
|
|
are URL-encoded. Added support in http-client to use
URL-encoding. Also added the missing include directory
for the inets application.
OTP-8940
[httpd] Prevent XSS in error pages.
Prevent user controlled input from being interpreted
as HTML in error pages by encoding the reserved HTML
characters.
Michael Santos
OTP-9124
|
|
* bmk/snmp/snmp421_integration:
Fixed install directory typo for man3. Peter Lemenkov. Hans Ulrich Niedermann.
The snmp config tool could not handle (manager) audit trail config because the option seqno was not handled. OTP-9354
[agent] The SNMP ACM cache was not properly updated when changes where made to the VACM security-to-group, access and view-tree-family tables. OTP-9367
Added marker id's in the snmpc(command) to allow linking top specific compiler options. Updated release notes accordingly. OTP-9437
[manager] There was no way to specify transport domain. The transport domains was assumed to be IPv4 (transportDomainUdpIpv4). This has now been changed so that it can also be IPv6 (transportDomainUdpIpv6). To facilitate this, the transport domain, tdomain, is now a (new) valid option when registering (snmpm#register_agent) a new agent (and updating (snmpm#update_agent_info) agent info). This also mean that the transport behaviour has changed. Fixed appup file. OTP-9305
[compiler] Make documentation for the snmpc escript regarding the the new option for warnings as errors ("--wae" in this case). Tuncer Ayaz. OTP-9437
[compiler] Added the option warnings_as_errors which specifies whether warnings should be treated as errors. Tuncer Ayaz. OTP-9437
Fixed unintended build to ebin dir of snmpc escript.
Cosmetics indenting...
Removed "crap" that somehow had gotten into the file (escape sequence).
Fixed install of MIB compiler escript. Was incorrectly installed both in bin end ebin.
Fixed (uncommented) test cases.
Improved (transport) domain error reporting.
Fixed release notes and API documentation for tdomain.xs
transport domain config option named tdomain. Removed debug printouts. transport domain error detection.
[manager] No way to specify transport domain. Transport domains was assumed to be IPv4. This has now been changed so that it can also be IPv6. To facilitate this, the transportDomain is now a (new) valid option. This also mean that the transport behaviour has changed. OTP-9305
Updated version.
[agent] Did not handle transport domains properly in some cases. OTP-9400
Utility make target for cleanig the repo...
...
|
|
Peter Lemenkov
Hans Ulrich Niedermann
OTP-9442
Merge branch 'bmk/snmp/install_dir_typo_man3/OTP-9442' into bmk/snmp/snmp421_integration
Conflicts:
lib/snmp/doc/src/notes.xml
|
|
Peter Lemenkov.
Hans Ulrich Niedermann.
OTP-9442
|
|
changes where made to the VACM security-to-group, access and
view-tree-family tables.
OTP-9367
Merge branch 'bmk/snmp/agent/acm_cache_cleanup/OTP-9367' into bmk/snmp/snmp421_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
|
|
because the option seqno was not handled.
OTP-9354
Merge branch 'bmk/snmp/audit_trail_config_bug/OTP-9354' into bmk/snmp/snmp421_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
|
|
because the option seqno was not handled.
OTP-9354
|
|
changes where made to the VACM security-to-group, access and
view-tree-family tables.
OTP-9367
|
|
top specific compiler options. Updated release notes
accordingly.
OTP-9437
|
|
compiler (escript) frontend, the option --wae is used) which
specifies whether warnings should be treated as errors.
Tuncer Ayaz.
OTP-9437
Merge branch 'bmk/snmp/compiler/warnings_as_errors/OTP-9437' into bmk/snmp/snmp421_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/src/compile/Makefile
|
|
The transport domains was assumed to be IPv4 (transportDomainUdpIpv4).
This has now been changed so that it can also be IPv6
(transportDomainUdpIpv6).
To facilitate this, the transport domain, tdomain, is now a (new) valid
option when registering (snmpm#register_agent) a new agent (and
updating (snmpm#update_agent_info) agent info).
This also mean that the transport behaviour has changed.
Fixed appup file.
OTP-9305
|
|
The transport domains was assumed to be IPv4 (transportDomainUdpIpv4).
This has now been changed so that it can also be IPv6
(transportDomainUdpIpv6).
To facilitate this, the transport domain, tdomain,
is now a (new) valid option when registering (snmpm#register_agent)
a new agent (and updating (snmpm#update_agent_info) agent info).
This also mean that the transport behaviour has changed.
OTP-9305
Merge branch 'bmk/snmp/manager/transport_domain/OTP-9305' into bmk/snmp/snmp421_integration
|
|
regarding the the new option for warnings as errors
("--wae" in this case).
Tuncer Ayaz.
OTP-9437
|
|
specifies whether warnings should be treated as errors.
Tuncer Ayaz.
OTP-9437
|
|
|
|
|
|
sequence).
|
|
both in bin end ebin.
|
|
|
|
|
|
|
|
Removed debug printouts.
transport domain error detection.
|
|
maint-r14
* bmk/snmp/agent/wrong_default_transport_domain/OTP-9425:
[agent] Did not handle transport domains properly in some cases, for instance trap sending. OTP-9400
[agent] Wrong default transport domain, snmpUDPDomain, instead of transportDomainUdpIpv4.
[agent] Did not handle transport domains properly in some cases, for instance trap sending.
|
|
bmk/snmp/manager/transport_domain/OTP-9305
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/agent/snmpa_mpd.erl
lib/snmp/src/app/snmp.appup.src
lib/snmp/vsn.mk
|
|
assumed to be IPv4.
This has now been changed so that it can also be IPv6. To facilitate this,
the transportDomain is now a (new) valid option.
This also mean that the transport behaviour has changed.
OTP-9305
[agent] A temporary fix for transport domain, specifically regarding
trap sending. This is done in order to make testing possible,
pending merge from topic branch.
OTP-9400
|
|
|
|
OTP-9400
|
|
|
|
|
|
|
|
|
|
* rickard/sbmbc/OTP-9339:
Use separate memory carriers for small blocks
|
|
* sverker/ets_delete-deadlock-race/OTP-9423:
Fix bug in ets:delete for write_concurrency that could lead to deadlock
|
|
* sverker/trace-ms-invalid-op/OTP-9422:
Fix a match-spec trace bug that could cause emulator crash
|
|
|