Repository: struts Updated Branches: refs/heads/master 4e9fa8423 -> d053df492
WW-4768 Adds support for dashes in boundary definition Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d053df49 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d053df49 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d053df49 Branch: refs/heads/master Commit: d053df4924578dcd060f74878d70d60268e85cd7 Parents: 4e9fa84 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Mar 23 10:13:59 2017 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Mar 23 10:13:59 2017 +0100 ---------------------------------------------------------------------- core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/d053df49/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index 280e27b..ea92eaf 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -87,7 +87,7 @@ public class Dispatcher { */ public static final String REQUEST_POST_METHOD = "POST"; - public static final String MULTIPART_FORM_DATA_REGEX = "^multipart\\/form-data(; boundary=[a-zA-Z0-9]{1,70})?"; + public static final String MULTIPART_FORM_DATA_REGEX = "^multipart\\/form-data(; boundary=[\\-a-zA-Z0-9]{1,70})?"; /** * Provide a thread local instance.