From 4616581dabcfb91a24f6e98dc928365a4da2b328 Mon Sep 17 00:00:00 2001
From: dd <dd@mediamid.com>
Date: Mon, 24 Feb 2025 12:46:21 +0100
Subject: [PATCH] Fix: Character encoding in multipart/form-data

---
 .../apache/struts/upload/CommonsMultipartRequestHandler.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java b/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
index d94328789..fa1a8a883 100644
--- a/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
+++ b/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
@@ -190,6 +190,9 @@ public void handleRequest(HttpServletRequest request)
         // Set the location for saving data on disk.
         factory.setFile(getRepositoryFile(ac));
 
+        // Sets the character encoding to be used
+        factory.setCharset(Charset.forName(request.getCharacterEncoding()));
+
         // Create a new file upload handler
         JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JakartaServletFileUpload<>(factory.get());