diff options
| author | Micael Karlberg <[email protected]> | 2011-03-18 18:37:39 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-18 18:37:39 +0100 |
| commit | f39147b4c35dd06f48eba0a446dd6881aa46c917 (patch) | |
| tree | 62e15d94df972eb25b2603c97940a7f0cf3c5230 /lib/inets/doc | |
| parent | f4b5ea566829cad609e14c2264158665b84800c1 (diff) | |
| parent | ffb2d69e00ef283eeb266f3082067429b6ce1127 (diff) | |
| download | otp-f39147b4c35dd06f48eba0a446dd6881aa46c917.tar.gz otp-f39147b4c35dd06f48eba0a446dd6881aa46c917.tar.bz2 otp-f39147b4c35dd06f48eba0a446dd6881aa46c917.zip | |
Merge branch 'bmk/inets/httpd/prevent_xss_in_error_pages/OTP-9124' into bmk/inets/inet56_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/doc')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 5343d28976..05b5f6b6e8 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -52,6 +52,7 @@ <item> <p>[ftp] Added (type) spec for all exported functions.</p> <p>Own Id: OTP-9114 Aux Id: seq11799</p> + </item> <item> <p>[httpd] @@ -60,7 +61,16 @@ <p>Bernard Duggan</p> <p>Own Id: OTP-9123</p> </item> + + <item> + <p>[httpd] Prevent XSS in error pages. + Prevent user controlled input from being interpreted + as HTML in error pages by encoding the reserved HTML + characters. </p> + <p>Michael Santos</p> + <p>Own Id: OTP-9124</p> </item> + </list> </section> |