Allow empty URLs in config values by default (#2253)
This commit is contained in:
parent
c6ee9b23c4
commit
bef2411132
|
@ -252,7 +252,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\
|
||||||
'form' => 'text',
|
'form' => 'text',
|
||||||
'msgFail' => '__badUrl__',
|
'msgFail' => '__badUrl__',
|
||||||
'test' =>
|
'test' =>
|
||||||
qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)|(?:[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+)))(?::(?:(?:[0-9]*)))?(?:\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*)(?:;(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*))*)(?:\/(?:(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*)(?:;(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*))*))*))(?:[?](?:(?:(?:[;\/?:@&=+\$,a-zA-Z0-9\-_.!~*'()]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*)))?))?)/
|
qr/(?:^$|(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)|(?:[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+)))(?::(?:(?:[0-9]*)))?(?:\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*)(?:;(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*))*)(?:\/(?:(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*)(?:;(?:(?:[a-zA-Z0-9\-_.!~*'():@&=+\$,]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*))*))*))(?:[?](?:(?:(?:[;\/?:@&=+\$,a-zA-Z0-9\-_.!~*'()]+|(?:%[a-fA-F0-9][a-fA-F0-9]))*)))?))?))/
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,9 +30,11 @@ sub perlExpr {
|
||||||
return $err ? ( -1, "__badExpression__: $err" ) : (1);
|
return $err ? ( -1, "__badExpression__: $err" ) : (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
my $url = $RE{URI}{HTTP}{ -scheme => "https?" };
|
my $url_re = $RE{URI}{HTTP}{ -scheme => "https?" };
|
||||||
$url =~ s/(?<=[^\\])\$/\\\$/g;
|
$url_re =~ s/(?<=[^\\])\$/\\\$/g;
|
||||||
$url = qr/$url/;
|
my $url = qr/$url_re/;
|
||||||
|
my $urlOrEmpty = qr/(?:^$|$url_re)/;
|
||||||
|
|
||||||
|
|
||||||
sub types {
|
sub types {
|
||||||
return {
|
return {
|
||||||
|
@ -51,7 +53,7 @@ sub types {
|
||||||
},
|
},
|
||||||
url => {
|
url => {
|
||||||
form => 'text',
|
form => 'text',
|
||||||
test => $url,
|
test => $urlOrEmpty,
|
||||||
msgFail => '__badUrl__',
|
msgFail => '__badUrl__',
|
||||||
},
|
},
|
||||||
PerlModule => {
|
PerlModule => {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user