Revert UTF-8 fix for now

theotherp · Nov 19, 2023 · 1ec84a0 · 1ec84a0
1 parent 748c051
commit 1ec84a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/src/main/java/org/nzbhydra/web/WebConfiguration.java b/core/src/main/java/org/nzbhydra/web/WebConfiguration.java
@@ -196,7 +196,7 @@ public void write(Object o, MediaType contentType, HttpOutputMessage outputMessa
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
                 marshaller.marshal(newznabResponse, new StreamResult(bos));
                 String result;
-                String originalXml = bos.toString(StandardCharsets.UTF_8);
+                String originalXml = bos.toString();
                 if (newznabResponse.getSearchType() == NewznabResponse.SearchType.TORZNAB) {
                     result = originalXml.replace("xmlns:newznab=\"http://www.newznab.com/DTD/2010/feeds/attributes/\"", "");
                 } else {

diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -1,4 +1,10 @@
 #@formatter:off
+-   version: "v5.3.3"
+    date: "2023-11-18"
+    changes:
+        -   type: "fix"
+            text: "Revert UTF-8 fix because 5.3.1 crashed on start. Oops, sorry."
+    final: true
 -   version: "v5.3.1"
     date: "2023-11-18"
     changes: