aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-09-19 12:44:27 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-09-19 12:44:27 +0100
commit9300bb826d25f975dd64dcc1e5ede0a4ff7aa208 (patch)
treee8d794bed85f55cc71dfe0657477acb08465c532
parentdfe7ee1429f91f06cae9e10dd18f770269271d29 (diff)
ftpserver.pl: Updated email regex from commit 98f7ca7e971006
...to not be as strict as it was rejecting valid numeric email addresses.
-rwxr-xr-xtests/ftpserver.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 4f5bbbbe2..88fd265fe 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -764,7 +764,7 @@ sub MAIL_smtp {
# Validate the from address (only <> and a valid email address inside
# <> are allowed, such as <user@example.com>)
if ((!$from) || (($from ne "<>") && ($from !~
- /^<([a-zA-Z][\w_.]+)\@([a-zA-Z0-9.-]+).([a-zA-Z]{2,4})>$/))) {
+ /^<([a-zA-Z0-9._%+-]+)\@([a-zA-Z0-9.-]+).([a-zA-Z]{2,4})>$/))) {
sendcontrol "501 Invalid address\r\n";
}
else {