Return-Path: 
 <commits-return-13132-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
X-Original-To: apmail-struts-commits-archive@minotaur.apache.org
Delivered-To: apmail-struts-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EBC7311690
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Wed, 18 Jun 2014 06:47:07 +0000 (UTC)
Received: (qmail 75971 invoked by uid 500); 18 Jun 2014 06:47:07 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 75936 invoked by uid 500); 18 Jun 2014 06:47:07 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 75927 invoked by uid 99); 18 Jun 2014 06:47:07 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 06:47:07 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 79A6283B324; Wed, 18 Jun 2014 06:47:07 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: lukaszlenart@apache.org
To: commits@struts.apache.org
Message-Id: <3391c2b0d4bf40d690d27cff25fb885b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: Adds additional classes to be excluded
Date: Wed, 18 Jun 2014 06:47:07 +0000 (UTC)

Repository: struts
Updated Branches:
  refs/heads/feature/exclude-object-class bbcc6014f -> 965428711


Adds additional classes to be excluded


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/96542871
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/96542871
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/96542871

Branch: refs/heads/feature/exclude-object-class
Commit: 965428711572ad52d3713b3432ff38e1dd3e9dae
Parents: bbcc601
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Wed Jun 18 08:45:56 2014 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Wed Jun 18 08:45:56 2014 +0200

----------------------------------------------------------------------
 core/src/main/resources/struts-default.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/96542871/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 49eba90..ea2a631 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -42,13 +42,17 @@
               value="
                 java.lang.Object,
                 java.lang.Runtime,
+                java.lang.System,
+                java.lang.Class,
+                java.lang.ClassLoader,
+                java.lang.Shutdown,
                 ognl.OgnlContext,
                 ognl.MemberAccess,
                 ognl.ClassResolver,
                 ognl.TypeConverter,
                 com.opensymphony.xwork2.ActionContext" />
     <!-- this must be valid regex, each '.' in package name must be escaped! -->
-    <constant name="struts.excludedPackageNamePatterns" value="^java\.lang.*,^ognl.*,^javax.*" />
+    <constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^javax.*" />
 
     <bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
     <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" />