Skip to content

Commit

Permalink
#1664 image fix (#1709)
Browse files Browse the repository at this point in the history
* fix(image): fix image load

#1664

* fix(image): improve log message

#1664
  • Loading branch information
drakulis authored and SubJunk committed Dec 9, 2018
1 parent f713df4 commit 5fe7ac6
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/main/java/net/pms/network/RequestV2.java
Expand Up @@ -593,8 +593,10 @@ private InputStream dlnaImageHandler(HttpResponse output, DLNAResource dlna, Str
}
iStream = DLNAResource.wrap(iStream, highRange, lowRange);
}
long totalsize = dlna.length(mediaRenderer);
setContentLengthHeader(output, totalsize ,iStream);

int contentLength = iStream.available();
LOGGER.trace("Image: Available Content-Length: {}", contentLength);
output.headers().set(HttpHeaders.Names.CONTENT_LENGTH, "" + contentLength);

output.headers().set(HttpHeaders.Names.CONTENT_TYPE, imageProfile.getMimeType());
output.headers().set(HttpHeaders.Names.ACCEPT_RANGES, HttpHeaders.Values.BYTES);
Expand Down Expand Up @@ -677,8 +679,10 @@ private InputStream dlnaThumbnailHandler(HttpResponse output, DLNAResource dlna,
iStream = DLNAResource.wrap(iStream, highRange, lowRange);
}

long totalsize = dlna.length(mediaRenderer);
setContentLengthHeader(output, totalsize ,iStream);
int contentLength = iStream.available();
LOGGER.trace("Thumbnail: Available Content-Length: {}", contentLength);
output.headers().set(HttpHeaders.Names.CONTENT_LENGTH, "" + contentLength);

output.headers().set(HttpHeaders.Names.CONTENT_TYPE, imageProfile.getMimeType());
output.headers().set(HttpHeaders.Names.ACCEPT_RANGES, HttpHeaders.Values.BYTES);
output.headers().set(HttpHeaders.Names.EXPIRES, getFutureDate() + " GMT");
Expand Down

0 comments on commit 5fe7ac6

Please sign in to comment.