From 51e8b1cc734239b3fd83d81f6133fd6521b7fd50 Mon Sep 17 00:00:00 2001
From: Adwait Kumar Singh <adwsingh@amazon.com>
Date: Wed, 29 Jan 2025 14:43:45 -0800
Subject: [PATCH] Invoke toStringType instead of toString in MimeHeaders

---
 java/org/apache/tomcat/util/http/MimeHeaders.java | 2 +-
 webapps/docs/changelog.xml                        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 43b089451d3f..0263e5711bbc 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -382,7 +382,7 @@ public MessageBytes getUniqueValue(String name) {
 
     public String getHeader(String name) {
         MessageBytes mh = getValue(name);
-        return mh != null ? mh.toString() : null;
+        return mh != null ? mh.toStringType() : null;
     }
 
     // -------------------- Removing --------------------
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f51364d2acc5..e85b823ce478 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -232,6 +232,10 @@
         <bug>69545</bug>: Improve CRLF skipping for the <code>available</code>
         method of the <code>ChunkedInputFilter</code>. (remm)
       </fix>
+      <fix>
+        Improve the performance of repeated calls to <code>getHeader()</code>.
+        Pull request <pr>813</pr> provided by Adwait Kumar Singh. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">