(hbase) branch branch-2 updated: HBASE-29531 Addendum fix missing charset in RS Status page (#7594)

[taklwu]

This is an automated email from the ASF dual-hosted git repository.

taklwu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 6c35277a14b HBASE-29531 Addendum fix missing charset in RS Status page 
(#7594)
6c35277a14b is described below

commit 6c35277a14bad961b5685dea7a991cd8e6b44fd0
Author: Dávid Paksy <pak...@apache.org>
AuthorDate: Wed Jan 7 22:11:29 2026 +0100

    HBASE-29531 Addendum fix missing charset in RS Status page (#7594)
    
    Signed-off-by: Tak Lon (Stephen) Wu <tak...@apache.org>
    Signed-off-by: Duo Zhang <zhang...@apache.org>
---
 .../src/main/resources/hbase-webapps/regionserver/regionserver.jsp      | 2 +-
 .../org/apache/hadoop/hbase/regionserver/http/TestRSStatusPage.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hbase-server/src/main/resources/hbase-webapps/regionserver/regionserver.jsp 
b/hbase-server/src/main/resources/hbase-webapps/regionserver/regionserver.jsp
index f25377e7e4d..19514b70684 100644
--- 
a/hbase-server/src/main/resources/hbase-webapps/regionserver/regionserver.jsp
+++ 
b/hbase-server/src/main/resources/hbase-webapps/regionserver/regionserver.jsp
@@ -39,7 +39,7 @@
   if (RSStatusConstants.FORMAT_JSON.equals(format)) {
     response.setContentType("application/json");
   } else {
-    response.setContentType("text/html");
+    response.setContentType("text/html;charset=utf-8");
   }
 
   if (!regionServer.isOnline()) {
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/http/TestRSStatusPage.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/http/TestRSStatusPage.java
index b40535a12a0..6fb1cdb9edc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/http/TestRSStatusPage.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/http/TestRSStatusPage.java
@@ -122,7 +122,7 @@ public class TestRSStatusPage {
     int port = firstServerName.getPort();
 
     URL url = new URL("http://"; + hostname + ":" + infoPort + 
"/regionserver.jsp");
-    String page = TestServerHttpUtils.getPageContent(url, "text/html");
+    String page = TestServerHttpUtils.getPageContent(url, 
"text/html;charset=utf-8");
 
     assertTrue(page.contains("<title>HBase Region Server: " + masterHostname + 
"</title>"));