From 9300bb826d25f975dd64dcc1e5ede0a4ff7aa208 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Thu, 19 Sep 2013 12:44:27 +0100 Subject: [PATCH] ftpserver.pl: Updated email regex from commit 98f7ca7e971006 ...to not be as strict as it was rejecting valid numeric email addresses. --- tests/ftpserver.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 4f5bbbb..88fd265 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 ) 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 { -- 2.7.4