aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-06-13Merge branch 'pan/heart_and_times/OTP-10111' into maint-r13Erlang/OTP
* pan/heart_and_times/OTP-10111: Make heart use clock_gettime when available
2012-06-13Make heart use clock_gettime when availablePatrik Nyblom
2012-01-27Merge branch 'bmk/snmp/snmp4174_integration/r13' into maint-r13Erlang/OTP
* bmk/snmp/snmp4174_integration/r13: [snmp/agent] Add proper release notes [snmp/agent] Wrong OID used for error message reply [snmp/agent] Added backup check for local_db [snmp/agent] Simultaneous snmpa:backup/1,2 calls interfere
2012-01-27Merge branch ↵Micael Karlberg
'bmk/snmp/agent/wrong_oid_for_snmpUnknownPDUHandlers2/OTP-9747/r13' into bmk/snmp/snmp4174_integration/r13 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-26Merge branch 'bmk/snmp/agent/simultaneous_backup_calls/OTP-9884/r13' into ↵Micael Karlberg
bmk/snmp/snmp4174_integration/r13
2012-01-26[snmp/agent] Add proper release notesMicael Karlberg
OTP-9884
2012-01-26[snmp/agent] Wrong OID used for error message replyMicael Karlberg
When sending an error message (reply) regarding snmpUnknownPDUHandlers, the agent used the wrong OID. OTP-9747
2012-01-26[snmp/agent] Added backup check for local_dbMicael Karlberg
Added a backup check also for local_db (same as for the mib-server). Updated appup and set proper version (vsn.mk). Finally added test case for issue. OTP-9884
2012-01-25[snmp/agent] Simultaneous snmpa:backup/1,2 calls interfereMicael Karlberg
Simultaneous snmpa#backup">snmpa:backup/1,2 calls interfere. The master agent did not check if a backup was already in progress when a backup request was accepted OTP-9884
2012-01-20Merge branch 'bmk/snmp/snmp4173_integration/r13' into maint-r13Erlang/OTP
* bmk/snmp/snmp4173_integration/r13: [snmp/agent] Incorrect mib server cache gclimit update [snmp] Updated doc and fixed wrequest create macros [snmp] Be more verbose in the worker procs [snmp] Add a more informative return value when the trap sending fails [snmp] Fixed the mt_trap test-case [snmp] Maximum number of varbinds in a Get-BULK response [snmp] Correted the expect bug in the snmp test utility [snmp] Mostly added some more verbosity stuff
2012-01-20Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into ↵Micael Karlberg
bmk/snmp/snmp4173_integration/r13 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-20Merge branch 'bmk/snmp/agent/get_bulk_with_large_max_reps/OTP-9700' into ↵Micael Karlberg
bmk/snmp/snmp4173_integration/r13
2012-01-19[snmp/agent] Incorrect mib server cache gclimit updateMicael Karlberg
Mib server cache gclimit update function incorrectly calls age update function. The gclimit update function update_mibs_cache_gclimit/1 incorrectly called update_mibs_cache_age/2 update function. OTP-9868
2011-12-21[snmp] Updated doc and fixed wrequest create macrosMicael Karlberg
Release notes updated, together with documentation of the new config option. Also fixed the wrequest create macros (forgot end parantesis). OTP-9700
2011-12-21[snmp] Be more verbose in the worker procsMicael Karlberg
Add a verbosity printout for results of the requests sent to it). Also fixed handling sent_trap and appup. OTP-9700
2011-12-21[snmp] Add a more informative return value when the trap sending failsMicael Karlberg
OTP-9700
2011-12-21[snmp] Fixed the mt_trap test-caseMicael Karlberg
It has long been broken, but this fact was hidden by the faulty expect functions. OTP-9700
2011-12-21[snmp] Maximum number of varbinds in a Get-BULK responseMicael Karlberg
As a means to prevent DoS, maximum number of varbinds in a Get-BULK response has been limited. Also, made some changes to the worker process "API". OTP-9700.
2011-12-21[snmp] Correted the expect bug in the snmp test utilityMicael Karlberg
This bug will in turn will trigger some other bugs (in the agent), these will be dealt with later. OTP-9700
2011-12-21[snmp] Mostly added some more verbosity stuffMicael Karlberg
OTP-9700
2011-11-01Merge branch 'bmk/inets/inets536_integration' into maint-r13Erlang/OTP
* bmk/inets/inets536_integration: [httpd] GET request with malformed header date caused server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674 Added versions 5.2, 5.1.3 and 5.1.2 again. OTP-9655 Uncommented ipv6 test cases. OTP-9655 Fixed HTML encode. First *try* to hex decode uri, and then do the actual html encode. OTP-9655 Skip catching hex decode failure. OTP-9655 Fixed hex-decoding. OTP-9655 Problems with proxy test cases. OTP-9655 Added release notes, appup and correct version. OTP-9655 The XSS prevention methods used was confused if the URL was encoded (hex-encoded). OTP-9655
2011-11-01[httpd] GET request with malformed header date causedMicael Karlberg
server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674 Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/OTP-9674' into bmk/inets/inets536_integration Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpd_test_lib.erl lib/inets/vsn.mk
2011-11-01[httpd] XSS prevention did not work for hex-encoded URL's.Micael Karlberg
OTP-9655 Merge branch 'bmk/inets/httpd/xss_when_erl_encoded/r13/OTP-9655' into bmk/inets/inets536_integration
2011-11-01[httpd] GET request with malformed header date causedMicael Karlberg
server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674
2011-11-01Added versions 5.2, 5.1.3 and 5.1.2 again.Micael Karlberg
OTP-9655
2011-10-26Uncommented ipv6 test cases.Micael Karlberg
OTP-9655
2011-10-26Fixed HTML encode. First *try* to hex decode uri, and thenMicael Karlberg
do the actual html encode. OTP-9655
2011-10-26Skip catching hex decode failure.Micael Karlberg
OTP-9655
2011-10-26Fixed hex-decoding.Micael Karlberg
OTP-9655
2011-10-25Problems with proxy test cases.Micael Karlberg
OTP-9655
2011-10-25Added release notes, appup and correct version.Micael Karlberg
OTP-9655
2011-10-25Merge branch 'maint-r13' of super:otp into ↵Micael Karlberg
bmk/inets/httpd/xss_when_erl_encoded/OTP-9655
2011-10-25The XSS prevention methods used was confused if theMicael Karlberg
URL was encoded (hex-encoded). OTP-9655
2011-09-19Prepare releaseErlang/OTP
2011-09-19Merge branch 'raimo/sctp-getsetopts/OTP-9544' into maint-r13Erlang/OTP
* 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
2011-09-19erts,kernel: Bugfix - read SCTP socket options from right protocol layerRaimo Niskanen
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
2011-09-19erts: Fix bug SCTP send can only be called from controlling processRaimo Niskanen
Conflicts: lib/kernel/test/gen_sctp_SUITE.erl
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-05-23Merge branch 'bmk/snmp/manager/override_community_for_req/OTP-9236' into ↵Erlang/OTP
maint-r13 * bmk/snmp/manager/override_community_for_req/OTP-9236: Added (intial) override community stuff. Udated documentation (and version).
2011-05-10Added (intial) override community stuff.Micael Karlberg
2011-05-06Udated documentation (and version).Micael Karlberg
2010-12-14Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r13Erlang/OTP
* nick/orber/old_ssl_option/OTP-8994: The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this. Conflicts: lib/orber/doc/src/notes.xml lib/orber/vsn.mk
2010-12-14Merge branch 'nick/orber/recursive_types/OTP-8868' into maint-r13Erlang/OTP
* nick/orber/recursive_types/OTP-8868: Support for recursive unions and structs. Break loop if recursive TypeCode. Added basic tests for recursive uinions and structs. Removed test code. Added partial support for recursive IDL types.
2010-12-14Support for recursive unions and structs. Break loop if recursive TypeCode.Niclas Eklund
2010-12-10Merge branch 'maint-r13' of super:otp into nick/orber/recursive_types/OTP-8868Niclas Eklund
2010-12-10The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. ↵Niclas Eklund
Only R14B was affected by this.
2010-10-27Prepare releaseErlang/OTP
2010-10-27Merge branch 'nick/cosNotification/deprecated_regexp/OTP-8846' into maint-r13Erlang/OTP
* nick/cosNotification/deprecated_regexp/OTP-8846: Fiex TR tag. Uppdatet year in header. Added missing bracket. Switched from using the deprecated regexp to re instead.
2010-10-27Merge branch 'nick/orber/corbaloc_http/OTP-8900' into maint-r13Erlang/OTP
* nick/orber/corbaloc_http/OTP-8900: Incorrect TR tag. A corbaloc http string could return an EXIT message, instead of a system exception, if the HTTP server closed the socket without returning a complete message. I.e. header and a body containing a stringified IOR.