OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 13-Aug-2005 00:04:15
Branch: HEAD Handle: 2005081223041400
Modified files:
openpkg-web petidomo.cgi
Log:
unbreak the processing (variable 'domain' was overwritten within
checks)
Summary:
Revision Changes Path
1.9 +19 -19 openpkg-web/petidomo.cgi
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/petidomo.cgi
============================================================================
$ cvs diff -u -r1.8 -r1.9 petidomo.cgi
--- openpkg-web/petidomo.cgi 14 Feb 2005 13:49:51 -0000 1.8
+++ openpkg-web/petidomo.cgi 12 Aug 2005 22:04:14 -0000 1.9
@@ -45,17 +45,17 @@
#
# corresponding Perl regular expression ($domain)
#
- $snum = "(?:[0-9]|[0-9]{2}|[0-1][0-9]{2}|2[0-4][0-9]|25[0-5])";
- $d = "[0-9]";
- $a = "[A-Za-z]";
- $let_dig_hyp = "(?:$a|$d|-)";
- $let_dig = "(?:$a|$d)";
- $ldh_str = "${let_dig_hyp}+";
- $dotnum = "$snum\\.$snum\\.$snum\\.$snum";
- $number = "$d+";
- $name = "$a$ldh_str$let_dig";
- $element = "(?:$name|#$number|\\[$dotnum\\])";
- $domain = "(?:$element\.)*$element";
+ my $snum = "(?:[0-9]|[0-9]{2}|[0-1][0-9]{2}|2[0-4][0-9]|25[0-5])";
+ my $d = "[0-9]";
+ my $a = "[A-Za-z]";
+ my $let_dig_hyp = "(?:$a|$d|-)";
+ my $let_dig = "(?:$a|$d)";
+ my $ldh_str = "${let_dig_hyp}+";
+ my $dotnum = "$snum\\.$snum\\.$snum\\.$snum";
+ my $number = "$d+";
+ my $name = "$a$ldh_str$let_dig";
+ my $element = "(?:$name|#$number|\\[$dotnum\\])";
+ my $domain = "(?:$element\.)*$element";
return $check =~ m/^$domain$/;
}
@@ -77,14 +77,14 @@
#
# corresponding Perl regular expression ($domain)
#
- $letter = "[A-Za-z]";
- $digit = "[0-9]";
- $let_dig = "(?:$letter|$digit)";
- $let_dig_hyp = "(?:$let_dig|-)";
- $ldh_str = "${let_dig_hyp}+";
- $label = "(?:$letter(?:(?:$ldh_str)?$let_dig)?)";
- $subdomain = "(?:$label\.)*$label";
- $domain = "(?:$subdomain| )";
+ my $letter = "[A-Za-z]";
+ my $digit = "[0-9]";
+ my $let_dig = "(?:$letter|$digit)";
+ my $let_dig_hyp = "(?:$let_dig|-)";
+ my $ldh_str = "${let_dig_hyp}+";
+ my $label = "(?:$letter(?:(?:$ldh_str)?$let_dig)?)";
+ my $subdomain = "(?:$label\.)*$label";
+ my $domain = "(?:$subdomain| )";
return $check =~ m/^$domain$/;
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
