Merge branch 'release/v1.8' into fix-go-gitea#6716-backport-v1.8

zeripath · Apr 26, 2019 · 21db6e1 · 21db6e1
2 parents e9d1cbd + 8b3aad9
commit 21db6e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/markup/html.go b/modules/markup/html.go
@@ -63,7 +63,7 @@ var (
 	// well as the HTML5 spec:
 	//   http://spec.commonmark.org/0.28/#email-address
 	//   https://html.spec.whatwg.org/multipage/input.html#e-mail-state-(type%3Demail)
-	emailRegex = regexp.MustCompile("[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*")
+	emailRegex = regexp.MustCompile("[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+")
 
 	linkRegex, _ = xurls.StrictMatchingScheme("https?://")
 )