Merge pull request playframework#257 from martinp/lighthouse-886-patch

[playframework#886] Fix validation problem with exclamation marks in URLs
arden · Aug 31, 2011 · 96dc068 · 96dc068
2 parents a01e09a + 6d19dbe
commit 96dc068
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/framework/src/play/data/validation/URLCheck.java b/framework/src/play/data/validation/URLCheck.java
@@ -9,7 +9,8 @@
 public class URLCheck extends AbstractAnnotationCheck<URL> {
 
     final static String mes = "validation.url";
-    static Pattern urlPattern = Pattern.compile("^(http|https|ftp)\\://[a-zA-Z0-9\\-\\.]+\\.[a-zA-Z]{2,3}(:[a-zA-Z0-9]*)?/?([a-zA-Z0-9\\-\\._\\?\\,\\'/\\\\\\+&amp;%\\$#\\=~])*$");
+    static Pattern urlPattern = Pattern.compile("^(http|https|ftp)\\://[a-zA-Z0-9\\-\\.]+\\.[a-z" +
+            "A-Z]{2,3}(:[a-zA-Z0-9]*)?/?([a-zA-Z0-9\\-\\._\\?\\,\\'/\\\\\\+&amp;%\\$#\\=~\\!])*$");
 
     @Override
     public void configure(URL url) {
@@ -22,5 +23,5 @@ public boolean isSatisfied(Object validatedObject, Object value, OValContext con
         }
         return urlPattern.matcher(value.toString()).matches();
     }
-   
+
 }