aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-19 19:31:42 +0200
committerMicael Karlberg <[email protected]>2011-09-19 19:31:42 +0200
commit368449d2316b0f0f7c0dce55a9dd47c3acadb76d (patch)
tree5b38a054ca7918f486992aef39ecf11305f021e2 /lib/inets/doc/src
parent7c730a573a7e239f41bc619b024a675667767428 (diff)
parent1fd7edb98877afdf8e044ee8f4f3c1f9fca371ce (diff)
downloadotp-368449d2316b0f0f7c0dce55a9dd47c3acadb76d.tar.gz
otp-368449d2316b0f0f7c0dce55a9dd47c3acadb76d.tar.bz2
otp-368449d2316b0f0f7c0dce55a9dd47c3acadb76d.zip
Merge branch 'bmk/inets/httpd/windows_dir_traversal/OTP-OTP-9561' into bmk/inets/inets571_integration
Conflicts: lib/inets/doc/src/notes.xml
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/notes.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 60559afc2e..5b5dfdde21 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -69,6 +69,14 @@
<p>Own Id: OTP-9434</p>
</item>
+ <item>
+ <p>[httpd] Fix httpd directory traversal on Windows.
+ Directory traversal was possible on Windows where
+ backward slash is used as directory separator. </p>
+ <p>Andr�s Veres-Szentkir�lyi.</p>
+ <p>Own Id: OTP-9561</p>
+ </item>
+
</list>
</section>