diff options
author | Micael Karlberg <[email protected]> | 2011-09-23 16:15:29 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-09-23 16:15:29 +0200 |
commit | 3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f (patch) | |
tree | da1a5b930a9e7b8eb4db170b6ad14478a3ff891a /lib/inets/src/http_server/httpd_request.erl | |
parent | 524ad34276ef31fc5c306943539e3fe9bd19ad8c (diff) | |
parent | 1ead5e977d307ae391fdfd34e28fa5d587db2855 (diff) | |
download | otp-3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f.tar.gz otp-3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f.tar.bz2 otp-3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f.zip |
Merge branch 'major' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/inets/src/http_server/httpd_request.erl')
-rw-r--r-- | lib/inets/src/http_server/httpd_request.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl index 7084d9824a..90f8bdd912 100644 --- a/lib/inets/src/http_server/httpd_request.erl +++ b/lib/inets/src/http_server/httpd_request.erl @@ -312,8 +312,8 @@ validate_uri(RequestURI) -> {'EXIT',_Reason} -> {error, {bad_request, {malformed_syntax, RequestURI}}}; _ -> - Path = format_request_uri(UriNoQueryNoHex), - Path2=[X||X<-string:tokens(Path, "/"),X=/="."], %% OTP-5938 + Path = format_request_uri(UriNoQueryNoHex), + Path2 = [X||X<-string:tokens(Path, "/\\"),X=/="."], validate_path( Path2,0, RequestURI) end. |