aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-26Merge branch 'sverker/remove-static-ssl-linking/OTP-9566' into maint-r14Erlang/OTP
* 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
2011-09-26crypto: touch Makefile to provoke patch releaseSverker Eriksson
2011-09-23Change static link test of ssl to dynamicBjörn-Egil Dahlberg
Only used for commercial builds
2011-09-23Remove static ssl linking in crypto for otp_buildBjörn-Egil Dahlberg
2011-09-16Merge branch 'maint-r13' into maint-r14Micael Karlberg
2011-09-15Merge branch 'bmk/inets/httpd/cross_site_scripting_attacks/OTP-9535' into ↵Erlang/OTP
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.
2011-09-15Updated http-server to make sure URLs in error-messagesMicael Karlberg
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
2011-07-22Merge branch 'bmk/snmp/snmp421_integration' into maint-r14Erlang/OTP
* 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... ...
2011-07-22Fixed install directory typo for man3.Micael Karlberg
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
2011-07-22Fixed install directory typo for man3.Micael Karlberg
Peter Lemenkov. Hans Ulrich Niedermann. OTP-9442
2011-07-22[agent] The SNMP ACM cache was not properly updated whenMicael Karlberg
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
2011-07-21The snmp config tool could not handle (manager) audit trail configMicael Karlberg
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
2011-07-21The snmp config tool could not handle (manager) audit trail configMicael Karlberg
because the option seqno was not handled. OTP-9354
2011-07-21[agent] The SNMP ACM cache was not properly updated whenMicael Karlberg
changes where made to the VACM security-to-group, access and view-tree-family tables. OTP-9367
2011-07-19Added marker id's in the snmpc(command) to allow linkingMicael Karlberg
top specific compiler options. Updated release notes accordingly. OTP-9437
2011-07-19[compiler] Added the option warnings_as_errors (for the SNMP MIBMicael Karlberg
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
2011-07-19[manager] There was no way to specify transport domain.Micael Karlberg
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
2011-07-19[manager] There was no way to specify transport domain.Micael Karlberg
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
2011-07-18[compiler] Make documentation for the snmpc escriptMicael Karlberg
regarding the the new option for warnings as errors ("--wae" in this case). Tuncer Ayaz. OTP-9437
2011-07-18[compiler] Added the option warnings_as_errors whichMicael Karlberg
specifies whether warnings should be treated as errors. Tuncer Ayaz. OTP-9437
2011-07-18Fixed unintended build to ebin dir of snmpc escript.Micael Karlberg
2011-07-15Cosmetics indenting...Micael Karlberg
2011-07-15Removed "crap" that somehow had gotten into the file (escapeMicael Karlberg
sequence).
2011-07-14Fixed install of MIB compiler escript. Was incorrectly installedMicael Karlberg
both in bin end ebin.
2011-07-13Fixed (uncommented) test cases.Micael Karlberg
2011-07-13Improved (transport) domain error reporting.Micael Karlberg
2011-07-12Fixed release notes and API documentation for tdomain.xsMicael Karlberg
2011-07-12transport domain config option named tdomain.Micael Karlberg
Removed debug printouts. transport domain error detection.
2011-07-12Merge branch 'bmk/snmp/agent/wrong_default_transport_domain/OTP-9425' into ↵Erlang/OTP
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.
2011-07-12Merge branch 'bmk/snmp/agent/wrong_default_transport_domain/OTP-9425' into ↵Micael Karlberg
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
2011-07-12[manager] No way to specify transport domain. Transport domains wasMicael Karlberg
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
2011-07-12Updated version.Micael Karlberg
2011-07-12[agent] Did not handle transport domains properly in some cases.Micael Karlberg
OTP-9400
2011-07-12Utility make target for cleanig the repo...Micael Karlberg
2011-07-12...Micael Karlberg
2011-07-12Merge branch 'maint-r14' of super:otp into maint-r14Micael Karlberg
2011-07-11Prepare releasemaint-r14b03Erlang/OTP
2011-07-11Merge branch 'rickard/sbmbc/OTP-9339' into maint-r14Erlang/OTP
* rickard/sbmbc/OTP-9339: Use separate memory carriers for small blocks
2011-07-11Merge branch 'sverker/ets_delete-deadlock-race/OTP-9423' into maint-r14Erlang/OTP
* sverker/ets_delete-deadlock-race/OTP-9423: Fix bug in ets:delete for write_concurrency that could lead to deadlock
2011-07-11Merge branch 'sverker/trace-ms-invalid-op/OTP-9422' into maint-r14Erlang/OTP
* sverker/trace-ms-invalid-op/OTP-9422: Fix a match-spec trace bug that could cause emulator crash
2011-07-08Use separate memory carriers for small blocksRickard Green
2011-07-08[agent] Did not handle transport domains properly in some cases,Micael Karlberg
for instance trap sending. OTP-9400 [agent] Wrong default transport domain, snmpUDPDomain, instead of transportDomainUdpIpv4. OTP-9425
2011-07-08[agent] Wrong default transport domain, snmpUDPDomain, insteadMicael Karlberg
of transportDomainUdpIpv4. OTP-9425
2011-07-08[agent] Did not handle transport domains properly in some cases,Micael Karlberg
for instance trap sending. OTP-9400
2011-07-07Fix a match-spec trace bug that could cause emulator crashSverker Eriksson
A trace matchspec with 'enable_trace' or 'disable_trace' in body could cause an emulator crash if a concurrent process altered the trace setting of the traced function by calling erlang:trace_pattern. The effect was a deallocation of the binary holding the matchspec program while it was running. Fixed by increasing reference count of ms-binary in the cases when 'enable_trace' or 'disable_trace' may cause a system block that may alter the ongoing trace. The paradox here is that db_prog_match() is using erts_smp_block_system() to do 'enable_trace' and 'disable_trace' in a safe (atomic) way. But that also have the (non-atomic) effect that racing thread might block the system and change the trace settings with erlang:trace_pattern.
2011-07-07Fix bug in ets:delete for write_concurrency that could lead to deadlockSverker Eriksson
Relocking in ets_delete_1() and remove_named_tab() was done by unlocking the table without clearing the is_thread_safe flag. A racing thread could then read-lock the table and then incorrectly write-unlock the table as db_unlock() looked at is_thread_safe to determine which kind of lock to unlock. Several fixes: 1. Make db_unlock() use argument 'kind' instead of is_thread_safe to determine lock type. 2. Make relock logic use db_lock() and db_unlock() instead of directly accessing lock primitives. 3. Do ownership transfer earlier in ets_delete_1 to avoid racing owner process to also start deleting the same table.
2011-07-06Merge branch 'ia/ssl/session-table-clean-up/OTP-9346' into maint-r14Erlang/OTP
* ia/ssl/session-table-clean-up/OTP-9346: The clean up of the session table now works as intended.
2011-07-06The clean up of the session table now works as intended.Ingela Anderton Andin
In ssl-4.1.5 temporary clean-up processes would crash resulting in that the session table would not be cleaned up (e.i. using more and more memory) and error reports would be printed, but connections would not be affected.
2011-06-22Merge branch 'bmk/inets/inets57_integration2' into maint-r14Erlang/OTP
* bmk/inets/inets57_integration2: Fixed non-related test case (ticket_6035). Corrected appup-file (missing ','). Fixed ipv6 support detection. (httpc) test case cleanups. Uppdated appup-file. Fixed IPv6 test case selection. That is if a IPv6 test case should be run or not. Stopping httpc client... Added test cases for httpd. Clients started stand-alone not properly handled. Clients started stand-alone not properly handled. Temporary solution for profile_name stuff. What about Pids??? SSL with IPv6 now works "in principle". [httpc] Remove unnecessary usage of iolist_to_binary when processing body (for PUT and POST). Filipe David Manana OTP-9317 Set proper version (5.7). Set proper version (5.7). Updated release notes. Peer/sockname resolv doesn't work with IPv6 addrs in HTTP. OTP-9343 OTP-9342: FTP client doesn't work with IPv6 OTP-9342: IpFamily config option was not handled OTP-9342: Release notes remain... OTP-9342: <credit>attila rajmund nohl</credit>
2011-06-22Fixed non-related ftp test case.Micael Karlberg
[ftp] FTP client doesn't work with IPv6 host. Attila Rajmund Nohl OTP-9342 Merge branch 'bmk/inets/ftp/does_not_handle_ipv6/OTP-9342' into bmk/inets/inets57_integration2