diff options
| author | Jonathan Pryor <jpryor@novell.com> | 2005-01-21 01:06:48 +0300 |
|---|---|---|
| committer | Jonathan Pryor <jpryor@novell.com> | 2005-01-21 01:06:48 +0300 |
| commit | 82399abc0edbb34907b87469ce7100225c024c74 (patch) | |
| tree | a3a48b831604f61622cecdffa82d5fa0ba3e875b | |
| parent | 0a0174cc5a1ed86bb622cea675f0520a79a6f0ae (diff) | |
* EndpointPermission.cs: Fix IsSubsetof(hostname) so that the regression
tests work. In particular, IsSubsetOf ("12.13.*.*", "12.13.14.*") failed
because 14 wasn't a subset of * (which it is). Fix: if part1 is we
continue to the next portion.
svn path=/trunk/mcs/; revision=39282
| -rw-r--r-- | mcs/class/System/System.Net/ChangeLog | 7 | ||||
| -rw-r--r-- | mcs/class/System/System.Net/EndpointPermission.cs | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog index fe24ebf4f1d..46caa36d569 100644 --- a/mcs/class/System/System.Net/ChangeLog +++ b/mcs/class/System/System.Net/ChangeLog @@ -1,5 +1,12 @@ 2005-01-20 Jonathan Pryor <jonpryor@vt.edu> + * EndpointPermission.cs: Fix IsSubsetof(hostname) so that the regression + tests work. In particular, IsSubsetOf ("12.13.*.*", "12.13.14.*") failed + because 14 wasn't a subset of * (which it is). Fix: if part1 is we + continue to the next portion. + +2005-01-20 Jonathan Pryor <jonpryor@vt.edu> + * IPAddress.cs (ParseIPV4): Fix so that the regression tests work. In particular, " foo" and ".1.1.6" weren't being caught (" foo" because it started with a space, and ".1.1.6" because the split string accepted a diff --git a/mcs/class/System/System.Net/EndpointPermission.cs b/mcs/class/System/System.Net/EndpointPermission.cs index 434ba912fde..92ff6941a82 100644 --- a/mcs/class/System/System.Net/EndpointPermission.cs +++ b/mcs/class/System/System.Net/EndpointPermission.cs @@ -157,6 +157,8 @@ namespace System.Net int part2 = ToNumber (h2 [i]);
if (part2 == -1)
return false;
+ if (part1 == 256) + continue; if (part1 != part2 && part2 != 256)
return false;
}
|