Merge pull request aws#545 from andrewgaul/s3-unknown-content-type

shorea · shorea · commit cc755dd39df8 · 2015-11-30T15:12:44.000-08:00
Use Content-Type application/octet-stream when not set
diff --git a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java
@@ -3584,7 +3584,7 @@ private <X, Y extends AmazonWebServiceRequest> X invoke(Request<Y> request,
              */
             if (!request.getHeaders().containsKey(Headers.CONTENT_TYPE)) {
                 request.addHeader(Headers.CONTENT_TYPE,
-                    "application/x-www-form-urlencoded; charset=utf-8");
+                    "application/octet-stream");
             }
             AWSCredentials credentials = awsCredentialsProvider.getCredentials();
             if (originalRequest.getRequestCredentials() != null) {

Original file line number	Diff line number	Diff line change
`@@ -3584,7 +3584,7 @@ private <X, Y extends AmazonWebServiceRequest> X invoke(Request<Y> request,`
`3584`	`3584`	`*/`
`3585`	`3585`	`if (!request.getHeaders().containsKey(Headers.CONTENT_TYPE)) {`
`3586`	`3586`	`request.addHeader(Headers.CONTENT_TYPE,`
`3587`		`- "application/x-www-form-urlencoded; charset=utf-8");`
	`3587`	`+ "application/octet-stream");`
`3588`	`3588`	`}`
`3589`	`3589`	`AWSCredentials credentials = awsCredentialsProvider.getCredentials();`
`3590`	`3590`	`if (originalRequest.getRequestCredentials() != null) {`