Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Greg Wilkins 2017-10-20 11:10:27 +11:00
commit 348cbb02c0

View File

@ -634,7 +634,7 @@ public class HttpURI
/* ------------------------------------------------------------ */
public void decodeQueryTo(MultiMap<String> parameters)
{
if (_query==_fragment)
if (_query==null)
return;
UrlEncoded.decodeUtf8To(_query,parameters);
}
@ -648,7 +648,7 @@ public class HttpURI
/* ------------------------------------------------------------ */
public void decodeQueryTo(MultiMap<String> parameters, Charset encoding) throws UnsupportedEncodingException
{
if (_query==_fragment)
if (_query==null)
return;
if (encoding==null || StandardCharsets.UTF_8.equals(encoding))