1 files changed, 2 insertions, 0 deletions
diff --git a/mcs/class/referencesource/System.Web/Configuration/MembershipSection.cs b/mcs/class/referencesource/System.Web/Configuration/MembershipSection.cs
index f3ea42245b8..a58f233ea60 100644
--- a/mcs/class/referencesource/System.Web/Configuration/MembershipSection.cs
+++ b/mcs/class/referencesource/System.Web/Configuration/MembershipSection.cs
@@ -48,6 +48,7 @@ namespace System.Web.Configuration {
                    minRequiredPasswordLength="int"            The minimum number of characters required in a password
                    minRequiredNonAlphanumericCharacters="int" The minimum number of non-alphanumeric characters that are required in a password
                    passwordStrengthRegularExpression="string" The regular expression used to test the password strength
+                   passwordStrengthRegexTimeout="int"         The timeout in milliseconds for the regex we use to check password strength 
         -->
 
         <membership defaultProvider="AspNetSqlMembershipProvider" userIsOnlineTimeWindow="15" >
@@ -60,6 +61,7 @@ namespace System.Web.Configuration {
                     minRequiredPasswordLength="7"
                     minRequireNonAlphanumericCharacters="1"
                     passwordStrengthRegularExpression=""
+                    passwordStrengthRegexTimeout="2000"
                     enablePasswordRetrieval="false"
                     enablePasswordReset="true"
                     requiresQuestionAndAnswer="true"