Set Content-Type only when provided by client

pull/16/head
Andrew Gaul 2014-09-05 12:46:53 -07:00
rodzic c6115546c4
commit 99a00499ca
1 zmienionych plików z 6 dodań i 2 usunięć

Wyświetl plik

@ -834,8 +834,11 @@ final class S3ProxyHandler extends AbstractHandler {
HttpHeaders.CONTENT_ENCODING))
.contentLanguage(request.getHeader(
HttpHeaders.CONTENT_LANGUAGE))
.contentLength(request.getContentLength())
.contentType(request.getContentType());
.contentLength(request.getContentLength());
String contentType = request.getContentType();
if (contentType != null) {
builder.contentType(contentType);
}
long expires = request.getDateHeader(HttpHeaders.EXPIRES);
if (expires != -1) {
builder = builder.expires(new Date(expires));
@ -843,6 +846,7 @@ final class S3ProxyHandler extends AbstractHandler {
if (contentMD5 != null) {
builder = builder.contentMD5(contentMD5);
}
PutOptions options = new PutOptions()
.multipart(forceMultiPartUpload);
try {