Skip to content

Commit 814aaf2

Browse files
committed
[bugfix] writeResultJSON Ignores media types settings.
1 parent 825e1c4 commit 814aaf2

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

exist-core/src/main/java/org/exist/http/RESTServer.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,19 @@ private void writeResultJSON(final HttpServletResponse response,
23402340
int start, final Properties outputProperties, final boolean wrap, final long compilationTime, final long executionTime)
23412341
throws BadRequestException {
23422342

2343+
// set output headers
2344+
final String encoding = getEncoding(outputProperties);
2345+
if (!response.containsHeader("Content-Type")) {
2346+
String mimeType = outputProperties.getProperty(OutputKeys.MEDIA_TYPE);
2347+
if (mimeType != null) {
2348+
final int semicolon = mimeType.indexOf(';');
2349+
if (semicolon != Constants.STRING_NOT_FOUND) {
2350+
mimeType = mimeType.substring(0, semicolon);
2351+
}
2352+
response.setContentType(mimeType + "; charset=" + encoding);
2353+
}
2354+
}
2355+
23432356
// calculate number of results to return
23442357
final int rlen = results.getItemCount();
23452358
if (!results.isEmpty()) {

0 commit comments

Comments
 (0)