root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SpringUrl Velocity macro URI encoding 

Prior to this commit, the springUrl Velocity macro would only prepend
the context to the given URL; this means that the
ServletHttpResponse.encodeUri method is not called and neither the
ResourceUrlProvider.

This commit changes this macro to use RequestContext.getContextUrl which
prepends the context and encodes the URI.

Issue: SPR-14027
This commit is contained in:
Brian Clozel 2016-03-08 17:07:59 +01:00
parent 89cf4772d5
commit 0a56667093
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity/spring.vm
View File

@ -55,7 +55,7 @@
* Takes a relative URL and makes it absolute from the server root by * Takes a relative URL and makes it absolute from the server root by
* adding the context root for the web application. * adding the context root for the web application.
*# *#
#macro( springUrl $relativeUrl )$springMacroRequestContext.getContextPath()${relativeUrl}#end #macro( springUrl $relativeUrl )$springMacroRequestContext.getContextUrl(${relativeUrl})#end
#** #**
* springBind * springBind