Merge pull request #409 from Alkarex/patch-1

[mono.git] / mcs / class / System / System.Net / EndpointPermission.cs

diff --git a/mcs/class/System/System.Net/EndpointPermission.cs b/mcs/class/System/System.Net/EndpointPermission.cs
index 92ff6941a82f07a8f18f10d805c35715568d5ff6..80b0fb465365e075a7180de2d3467b30299ee54a 100644 (file)
--- a/mcs/class/System/System.Net/EndpointPermission.cs
+++ b/mcs/class/System/System.Net/EndpointPermission.cs
@@ -4,27 +4,27 @@
 // Author:\r
 //   Lawrence Pit (loz@cable.a2000.nl)\r
 //\r
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+\r
+//\r
+// Permission is hereby granted, free of charge, to any person obtaining\r
+// a copy of this software and associated documentation files (the\r
+// "Software"), to deal in the Software without restriction, including\r
+// without limitation the rights to use, copy, modify, merge, publish,\r
+// distribute, sublicense, and/or sell copies of the Software, and to\r
+// permit persons to whom the Software is furnished to do so, subject to\r
+// the following conditions:\r
+// \r
+// The above copyright notice and this permission notice shall be\r
+// included in all copies or substantial portions of the Software.\r
+// \r
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+//\r
 \r
 using System;\r
 using System.Collections;\r
@@ -157,8 +157,8 @@ namespace System.Net
                                int part2 = ToNumber (h2 [i]);\r
                                if (part2 == -1)\r
                                        return false;                           \r
-                               if (part1 == 256)
-                                       continue;
+                               if (part1 == 256)\r
+                                       continue;\r
                                if (part1 != part2 && part2 != 256)\r
                                        return false;\r
                        }\r
@@ -327,7 +327,7 @@ namespace System.Net
                        if (isHostname) {\r
                                this.hasWildcard = false;\r
                                try {\r
-                                       this.addresses = Dns.GetHostByName (hostname).AddressList;\r
+                                       this.addresses = Dns.GetHostAddresses (hostname);\r
                                } catch (System.Net.Sockets.SocketException) {                                  \r
                                }\r
                        } else {\r