Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5286 from eclipse/jetty-9.4.x-5285-415-unsupported-media-type 

Issue #5285 - Using Status code 415 Unsupported Media Type instead
This commit is contained in:
Joakim Erdfelt 2020-09-17 02:42:50 -05:00 committed by GitHub
parent ba22c08fde 290c98e9b1
commit c6ed603453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -497,6 +497,14 @@ public class Request implements HttpServletRequest
} }
} }
private boolean isContentEncodingSupported()
{
String contentEncoding = getHttpFields().get(HttpHeader.CONTENT_ENCODING);
if (contentEncoding == null)
return true;
return HttpHeaderValue.IDENTITY.is(contentEncoding);
}
private void extractContentParameters() private void extractContentParameters()
{ {
String contentType = getContentType(); String contentType = getContentType();
@ -512,12 +520,11 @@ public class Request implements HttpServletRequest
if (MimeTypes.Type.FORM_ENCODED.is(baseType) && if (MimeTypes.Type.FORM_ENCODED.is(baseType) &&
_channel.getHttpConfiguration().isFormEncodedMethod(getMethod())) _channel.getHttpConfiguration().isFormEncodedMethod(getMethod()))
{ {
if (_metaData != null) if (_metaData != null && !isContentEncodingSupported())
{ {
String contentEncoding = getHttpFields().get(HttpHeader.CONTENT_ENCODING); throw new BadMessageException(HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, "Unsupported Content-Encoding");
if (contentEncoding != null && !HttpHeaderValue.IDENTITY.is(contentEncoding))
throw new BadMessageException(HttpStatus.NOT_IMPLEMENTED_501, "Unsupported Content-Encoding");
} }
extractFormParameters(_contentParameters); extractFormParameters(_contentParameters);
} }
else if (MimeTypes.Type.MULTIPART_FORM_DATA.is(baseType) && else if (MimeTypes.Type.MULTIPART_FORM_DATA.is(baseType) &&
@ -526,8 +533,10 @@ public class Request implements HttpServletRequest
{ {
try try
{ {
if (_metaData != null && getHttpFields().contains(HttpHeader.CONTENT_ENCODING)) if (_metaData != null && !isContentEncodingSupported())
throw new BadMessageException(HttpStatus.NOT_IMPLEMENTED_501, "Unsupported Content-Encoding"); {
throw new BadMessageException(HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, "Unsupported Content-Encoding");
}
getParts(_contentParameters); getParts(_contentParameters);
} }
catch (IOException e) catch (IOException e)

2
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
View File

@ -613,7 +613,7 @@ public class RequestTest
} }
catch (BadMessageException e) catch (BadMessageException e)
{ {
return e.getCode() == 501; return e.getCode() == 415;
} }
} }
}; };