Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch responseEncodedHtmlEscape default to true

Browse Source 
Issue: SPR-12369
This commit is contained in:
Juergen Hoeller
2014-12-30 15:01:20 +01:00
parent 0a36559a43
commit 3bfe4dcca7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
View File

@@ -265,6 +265,8 @@ public class RequestContext {
// context-param in web.xml, if any.
this.defaultHtmlEscape = WebUtils.getDefaultHtmlEscape(this.webApplicationContext.getServletContext());
// Determine response-encoded HTML escape setting from the "responseEncodedHtmlEscape"
// context-param in web.xml, if any.
this.responseEncodedHtmlEscape = WebUtils.getResponseEncodedHtmlEscape(this.webApplicationContext.getServletContext());
this.urlPathHelper = new UrlPathHelper();
@@ -491,11 +493,11 @@ public class RequestContext {
/**
* Is HTML escaping using the response encoding by default?
* If enabled, only XML markup significant characters will be escaped with UTF-* encodings.
* <p>Falls back to {@code false} in case of no explicit default given.
* <p>Falls back to {@code true} in case of no explicit default given, as of Spring 4.2.
* @since 4.1.2
*/
public boolean isResponseEncodedHtmlEscape() {
return (this.responseEncodedHtmlEscape != null && this.responseEncodedHtmlEscape.booleanValue());
return (this.responseEncodedHtmlEscape == null || this.responseEncodedHtmlEscape.booleanValue());
}
/**