The Vulnerability History Project

Extracted the oscore dependency, enabled multiple struts config files of the same name

      to be automatically loaded, made the JSF interceptors more quiet when JSF isn't
around
XW-414 XW-413 WW-1424


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@441909 13f79535-47bb-0310-9956-ffa450edef68

by Isaac the Iguana 2006-09-10 05:28:16 UTC

commit 7a0a6d58016b244e9521442f1e9666521f5c61b9

Struts VCC Insecure Token Generator CVE-2014-7809

core/src/main/java/org/apache/struts2/components/Bean.java

+1 -1

core/src/main/java/org/apache/struts2/components/Property.java

+2 -2

core/src/main/java/org/apache/struts2/components/Text.java

+1 -1

core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java

+1 -1

core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java

+1 -1

core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java

+16 -25

core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

+2 -2

core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java

+1 -1

core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java

-1

core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java

+2 -2

core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java

+3 -32

core/src/main/java/org/apache/struts2/util/StrutsUtil.java

+5 -1

core/src/main/java/org/apache/struts2/util/TokenHelper.java

+3 -9

core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java

+1 -1

core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java

+1 -1

core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java

+10 -4

core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java

+1 -1

core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java

+1 -1

core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java

+1 -1

core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java

+6

core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java

+1 -1