aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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.
2010-10-27Fiex TR tag.Niclas Eklund
2010-10-27Incorrect TR tag.Niclas Eklund
2010-10-25Update version numbersErlang/OTP
2010-10-25Merge branch 'nick/ssh/missing_catch/OTP-8908' into maint-r13Erlang/OTP
* nick/ssh/missing_catch/OTP-8908: The fix regarding OTP-8863 was not included in the previous version as stated
2010-10-25The fix regarding OTP-8863 was not included in the previous version as statedNiclas Eklund
2010-10-21Update release notesErlang/OTP
2010-10-21Merge branch 'nick/ssh/fix-process-leak/OTP-8807' into maint-r13Erlang/OTP
* nick/ssh/fix-process-leak/OTP-8807: Fix race condition when terminating a connection. fix process leak in ssh_system_sup (dynamicaly created childs where not cleaned up)
2010-10-21Merge branch 'nick/ssh/crash_report/OTP-8881' into maint-r13Erlang/OTP
* nick/ssh/crash_report/OTP-8881: In some cases a crash report was generated when a connection was closing down. This was caused by a race condition between two processes.
2010-10-19Merge branch 'maint-r13' of super:otp into nick/orber/corbaloc_http/OTP-8900Niclas Eklund
2010-10-19A corbaloc http string could return an EXIT message, instead of a systemNiclas Eklund
exception, if the HTTP server closed the socket without returning a complete message. I.e. header and a body containing a stringified IOR.
2010-10-14Add test suite for cosFileTransferNiclas Eklund
2010-10-06In some cases a crash report was generated when a connection was closing down.Niclas Eklund
This was caused by a race condition between two processes.
2010-10-04Prepare releaseErlang/OTP
2010-10-04Merge branch 'kenneth/asn1/enc_extaddgrp/OTP-8866' into maint-r13Erlang/OTP
* kenneth/asn1/enc_extaddgrp/OTP-8866: Add additional test to cover this correction correct the encoding of ExtensionAdditionGroup temp Add support for ExtensionAdditionGroup notation in nested types as well
2010-10-04Add additional test to cover this correctionKenneth Lundin
2010-09-24correct the encoding of ExtensionAdditionGroupKenneth Lundin
2010-09-23tempKenneth Lundin
2010-09-23Add support for ExtensionAdditionGroup notation in nested types as wellKenneth Lundin
In the previous version support for ExtensionAdditionGroups (i.e [[...]]) was added but it did not handle the occurence of the notation in nested types. Now this is handled as well and the support is hopefully complete. Also cleanup of warnings for obsolete guard functions in test suites.
2010-09-23Added basic tests for recursive uinions and structs.Niclas Eklund
2010-09-23Removed test code.Niclas Eklund