Merge remote-tracking branch 'origin/4.0' into 4.1

eclipse-ee4j · Oct 24, 2024 · 3440421 · 3440421
2 parents 340fa88 + 76f1b4e
commit 3440421
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/impl/src/main/java/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java b/impl/src/main/java/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java
@@ -500,7 +500,8 @@ else if (null != cdataStartSlashStar.reset() && cdataStartSlashStar.find()
         } else if (!withinStyle || isStyle) {
             isStyle = false;
         }
-        if (!withinScript && !withinScript) {
+        // always turn escaping back on once an element ends
+        if (!withinScript && !withinStyle) {
             dontEscape = false;
         }