From 8e6ab0bdb8569ff1328fb7e7eeec10f3c21e2450 Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Tue, 20 Oct 2015 07:42:34 +0000
Subject: [PATCH] HTTPCLIENT-1665: MultipartEntity to use US-ASCII charset by
 default (regression)

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.5.x@1709523 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/http/entity/mime/MultipartEntity.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/MultipartEntity.java b/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/MultipartEntity.java
index 0a09ee78f..07c43b6f2 100644
--- a/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/MultipartEntity.java
+++ b/httpmime/src/main/java-deprecated/org/apache/http/entity/mime/MultipartEntity.java
@@ -70,7 +70,7 @@ public class MultipartEntity implements HttpEntity {
         super();
         this.builder = new MultipartEntityBuilder()
                 .setMode(mode)
-                .setCharset(charset)
+                .setCharset(charset != null ? charset : MIME.DEFAULT_CHARSET)
                 .setBoundary(boundary);
         this.entity = null;
     }