This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 930c6de80 Merge pull request #657 from
atlassian/WW-5279-xml-config-provider
add 68a401aac WW-5275 Allows to provide a custom CspSettings per action
new 31a24ee70 Merge pull request #658 from apache/WW-5275-custom-csp
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...vletContextAware.java => CspSettingsAware.java} | 12 +++--
.../struts2/interceptor/csp/CspInterceptor.java | 45 +++++++++++++-----
.../struts2/interceptor/csp/CspSettings.java | 8 +++-
.../interceptor/csp/DefaultCspSettings.java | 8 ++++
.../struts2/interceptor/CspInterceptorTest.java | 54 ++++++++++++++--------
5 files changed, 90 insertions(+), 37 deletions(-)
copy core/src/main/java/org/apache/struts2/action/{ServletContextAware.java =>
CspSettingsAware.java} (73%)