andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1833] Replace ; with & only in the QueryString and not the whole URI

Browse Source
This commit is contained in:
Phillip Schichtel 2013-09-12 14:09:41 +02:00 committed by Norman Maurer
parent cd275ba67e
commit 2243970294
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
View File

@ -113,8 +113,7 @@ public class QueryStringDecoder {
"maxParams: " + maxParams + " (expected: a positive integer)");
}
// http://en.wikipedia.org/wiki/Query_string
this.uri = uri.replace(';', '&');
this.uri = uri;
this.charset = charset;
this.maxParams = maxParams;
this.hasPath = hasPath;
@ -160,10 +159,8 @@ public class QueryStringDecoder {
hasPath = false;
}
// Also take care of cut of things like "http://localhost"
String newUri = rawPath + '?' + uri.getRawQuery();
this.uri = rawPath + '?' + uri.getRawQuery();
// http://en.wikipedia.org/wiki/Query_string
this.uri = newUri.replace(';', '&');
this.charset = charset;
this.maxParams = maxParams;
}
@ -222,7 +219,8 @@ public class QueryStringDecoder {
name = decodeComponent(s.substring(pos, i), charset);
}
pos = i + 1;
} else if (c == '&') {
// http://www.w3.org/TR/html401/appendix/notes.html#h-B.2.2
} else if (c == '&' || c == ';') {
if (name == null && pos != i) {
// We haven't seen an `=' so far but moved forward.
// Must be a param of the form '&a&' so add it with