Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9BDFB2009F9 for ; Mon, 23 May 2016 17:04:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9AB52160A0E; Mon, 23 May 2016 15:04:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E1F10160A05 for ; Mon, 23 May 2016 17:04:57 +0200 (CEST) Received: (qmail 77674 invoked by uid 500); 23 May 2016 15:04:57 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 77665 invoked by uid 99); 23 May 2016 15:04:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2016 15:04:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6103FDFB14; Mon, 23 May 2016 15:04:56 +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: <3a41255fea7c46818d2f715b0d04f3d3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: struts git commit: Allows empty string as a action name Date: Mon, 23 May 2016 15:04:56 +0000 (UTC) archived-at: Mon, 23 May 2016 15:04:58 -0000 Repository: struts Updated Branches: refs/heads/support-2-3 54e8bf1f7 -> 34025eafe Allows empty string as a action name Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/34025eaf Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/34025eaf Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/34025eaf Branch: refs/heads/support-2-3 Commit: 34025eafec80bdff6e5a0fac2ad223329246a595 Parents: 54e8bf1 Author: Lukasz Lenart Authored: Mon May 23 17:04:38 2016 +0200 Committer: Lukasz Lenart Committed: Mon May 23 17:04:38 2016 +0200 ---------------------------------------------------------------------- .../org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/34025eaf/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java index cacc82c..529e033 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java @@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper { protected boolean allowSlashesInActionNames = false; protected boolean alwaysSelectFullNamespace = false; protected PrefixTrie prefixTrie = null; - protected Pattern allowedActionNames = Pattern.compile("^[a-zA-Z0-9_!/\\-]+((.htm[l]?)|(.action))?$"); + protected Pattern allowedActionNames = Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$"); private boolean allowActionPrefix = false; private boolean allowActionCrossNamespaceAccess = false;