aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-19 18:58:28 +0200
committerMicael Karlberg <[email protected]>2011-09-19 18:58:28 +0200
commit4fc04c07304185e0b7c479a60c25f191b24b54b5 (patch)
tree2ece4baf5fab369fd56ffe4048351ea7fc2bca38
parente84f232326b2800ca806c867b2bfbe3652d423cb (diff)
parenta93679550d8caac290ab4fe355c77ca7ed3ae18d (diff)
downloadotp-4fc04c07304185e0b7c479a60c25f191b24b54b5.tar.gz
otp-4fc04c07304185e0b7c479a60c25f191b24b54b5.tar.bz2
otp-4fc04c07304185e0b7c479a60c25f191b24b54b5.zip
Merge branch 'va/http-win-dir-traversal' into bmk/inets/httpd/windows_dir_traversal/OTP-OTP-9561
-rw-r--r--lib/inets/src/http_server/httpd_request.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 7084d9824a..d2d354d17d 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -313,7 +313,7 @@ validate_uri(RequestURI) ->
{error, {bad_request, {malformed_syntax, RequestURI}}};
_ ->
Path = format_request_uri(UriNoQueryNoHex),
- Path2=[X||X<-string:tokens(Path, "/"),X=/="."], %% OTP-5938
+ Path2=[X||X<-string:tokens(Path, "/\\"),X=/="."], %% OTP-5938
validate_path( Path2,0, RequestURI)
end.