You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/06/12 10:55:20 UTC
[3/3] struts git commit: Reverts previous RegEx
Reverts previous RegEx
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1c92a8b2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1c92a8b2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1c92a8b2
Branch: refs/heads/support-2-3
Commit: 1c92a8b2c910abdfaf97b95f4bf5ec2bfbeefeb7
Parents: b28b78c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Jun 3 13:12:02 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Jun 3 13:12:02 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/1c92a8b2/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 529e033..d696d13 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._!/\\-]*");
private boolean allowActionPrefix = false;
private boolean allowActionCrossNamespaceAccess = false;