Fix new pocoproject.org IPv6 address

This commit is contained in:
FrancisANDRE
2018-08-09 17:01:02 +02:00
parent c5f04a096d
commit 076517dc96
3 changed files with 3 additions and 173 deletions

View File

@@ -2,165 +2,6 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="NetCore">
<<<<<<< HEAD
<UniqueIdentifier>{5e1e1f88-22c0-4484-a36a-1f8a2525bc7c}</UniqueIdentifier>
</Filter>
<Filter Include="NetCore\Header Files">
<UniqueIdentifier>{94dd84a6-84bb-45b6-8e6d-cb10aef163a4}</UniqueIdentifier>
</Filter>
<Filter Include="NetCore\Source Files">
<UniqueIdentifier>{c7265eb0-37c9-4f92-b839-f6c19c318f23}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite">
<UniqueIdentifier>{82593b9c-4a42-4a10-b007-ecbdbe9c3d32}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Header Files">
<UniqueIdentifier>{eef6d2c2-736d-46a5-aacf-ba7d4cf01f35}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Source Files">
<UniqueIdentifier>{52ceb4a1-3040-4a62-910b-ee6dc8deb339}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver">
<UniqueIdentifier>{6df84e0a-4799-49d9-a216-d10e80f6c9e8}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver\Source Files">
<UniqueIdentifier>{c1b49088-3758-49df-8952-0d26869d69df}</UniqueIdentifier>
</Filter>
<Filter Include="Sockets">
<UniqueIdentifier>{bef15d71-e5e2-498c-aa44-0696d3cdac7d}</UniqueIdentifier>
</Filter>
<Filter Include="Sockets\Header Files">
<UniqueIdentifier>{2f1c42ac-9db7-4678-9c00-ef4bb191988d}</UniqueIdentifier>
</Filter>
<Filter Include="Sockets\Source Files">
<UniqueIdentifier>{c9539010-a2a9-4362-adb1-17d4e9221952}</UniqueIdentifier>
</Filter>
<Filter Include="Messages">
<UniqueIdentifier>{508317ba-1ed6-41ba-b208-e1d49ff83c9e}</UniqueIdentifier>
</Filter>
<Filter Include="Messages\Header Files">
<UniqueIdentifier>{8391eb5c-ba64-449e-a028-d6ae63e5a4bc}</UniqueIdentifier>
</Filter>
<Filter Include="Messages\Source Files">
<UniqueIdentifier>{e3068f1e-4c00-49c9-94e0-9ada9c57e1a5}</UniqueIdentifier>
</Filter>
<Filter Include="HTTP">
<UniqueIdentifier>{26d83142-9d7f-416f-97e3-9a4942681919}</UniqueIdentifier>
</Filter>
<Filter Include="HTTP\Header Files">
<UniqueIdentifier>{241a2d3b-f616-4e8f-bfa8-8be331296ccd}</UniqueIdentifier>
</Filter>
<Filter Include="HTTP\Source Files">
<UniqueIdentifier>{3c82f0f9-aa12-41a6-b2cb-87b9c78d7eba}</UniqueIdentifier>
</Filter>
<Filter Include="TCPServer">
<UniqueIdentifier>{565e354b-b9f1-4113-bbcd-5d77b180d59d}</UniqueIdentifier>
</Filter>
<Filter Include="TCPServer\Header Files">
<UniqueIdentifier>{ab211a4a-59f7-4b44-845f-0f70855913e0}</UniqueIdentifier>
</Filter>
<Filter Include="TCPServer\Source Files">
<UniqueIdentifier>{1c0c2ca7-3b87-43c1-80f5-185cc4490bd1}</UniqueIdentifier>
</Filter>
<Filter Include="HTTPServer">
<UniqueIdentifier>{b076bac7-7b9e-465e-8841-0fc30d546e72}</UniqueIdentifier>
</Filter>
<Filter Include="HTTPServer\Header Files">
<UniqueIdentifier>{de5b725d-c623-42ad-87ef-8f65c3d7c772}</UniqueIdentifier>
</Filter>
<Filter Include="HTTPServer\Source Files">
<UniqueIdentifier>{6d61d66a-14c2-467d-94ab-c68c98507bfc}</UniqueIdentifier>
</Filter>
<Filter Include="HTML">
<UniqueIdentifier>{45dafc49-4458-44f9-a1f1-fa3d0c15b7be}</UniqueIdentifier>
</Filter>
<Filter Include="HTML\Header Files">
<UniqueIdentifier>{82cc4709-8e03-46f2-9f37-6faf394064f9}</UniqueIdentifier>
</Filter>
<Filter Include="HTML\Source Files">
<UniqueIdentifier>{d633e0da-c96e-4d9a-b397-ca592bbe1436}</UniqueIdentifier>
</Filter>
<Filter Include="HTTPClient">
<UniqueIdentifier>{0a6cafcd-313d-43d9-8acb-6b502839ece1}</UniqueIdentifier>
</Filter>
<Filter Include="HTTPClient\Header Files">
<UniqueIdentifier>{b38bc3b6-45e3-46de-ae83-cc9e21d50082}</UniqueIdentifier>
</Filter>
<Filter Include="HTTPClient\Source Files">
<UniqueIdentifier>{b3d5de8d-6793-4df7-bd4f-6b4a21c96bea}</UniqueIdentifier>
</Filter>
<Filter Include="FTPClient">
<UniqueIdentifier>{d01c2ec5-b57b-49dc-8cbb-0b6c2414000d}</UniqueIdentifier>
</Filter>
<Filter Include="FTPClient\Header Files">
<UniqueIdentifier>{7132225e-f5c9-41de-b9ac-0bd51d6f993b}</UniqueIdentifier>
</Filter>
<Filter Include="FTPClient\Source Files">
<UniqueIdentifier>{2efea61a-70d7-498c-ad9b-776636c73b8b}</UniqueIdentifier>
</Filter>
<Filter Include="Reactor">
<UniqueIdentifier>{d313baf1-a67a-4c5a-a53e-3b8ceeeda871}</UniqueIdentifier>
</Filter>
<Filter Include="Reactor\Header Files">
<UniqueIdentifier>{fc3c5b0a-afda-4394-8326-68a512bd2aaa}</UniqueIdentifier>
</Filter>
<Filter Include="Reactor\Source Files">
<UniqueIdentifier>{9e8ec8f5-3fbc-46be-9e3f-e4911587687e}</UniqueIdentifier>
</Filter>
<Filter Include="Mail">
<UniqueIdentifier>{5da89b25-bfc0-4b6a-8dea-68669475c215}</UniqueIdentifier>
</Filter>
<Filter Include="Mail\Header Files">
<UniqueIdentifier>{96458fd1-d9dc-4add-8cca-4c4864f0bdce}</UniqueIdentifier>
</Filter>
<Filter Include="Mail\Source Files">
<UniqueIdentifier>{2cb5c2e9-03af-480e-b623-ddd8e0569cf4}</UniqueIdentifier>
</Filter>
<Filter Include="ICMP">
<UniqueIdentifier>{6094eedd-5529-4a0a-a0be-28117c20f08d}</UniqueIdentifier>
</Filter>
<Filter Include="ICMP\Header Files">
<UniqueIdentifier>{84646ba0-8e9d-4234-9048-2197a8271a8a}</UniqueIdentifier>
</Filter>
<Filter Include="ICMP\Source Files">
<UniqueIdentifier>{79d5e6dc-db38-4e2e-b620-2c78d80b3e64}</UniqueIdentifier>
</Filter>
<Filter Include="NTP">
<UniqueIdentifier>{27310a66-5b33-4887-992b-75251d79873d}</UniqueIdentifier>
</Filter>
<Filter Include="NTP\Header Files">
<UniqueIdentifier>{0f94d408-7cf1-4ee1-b903-de8ab6d17410}</UniqueIdentifier>
</Filter>
<Filter Include="NTP\Source Files">
<UniqueIdentifier>{7c2edba9-aabf-41d8-bdb4-f4363dec8428}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{10758494-d098-4681-bb6f-32137498ed3d}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{16635dd8-b44d-4ad5-8340-9b9a22451c1c}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{1d0a9a24-f19e-49e1-991c-5a13c17e8797}</UniqueIdentifier>
</Filter>
<Filter Include="WebSocket">
<UniqueIdentifier>{90a187fe-7787-429e-8877-7cdeb04c4445}</UniqueIdentifier>
</Filter>
<Filter Include="WebSocket\Header Files">
<UniqueIdentifier>{d5d5f4cd-c59d-497e-a27e-981f7cb25306}</UniqueIdentifier>
</Filter>
<Filter Include="WebSocket\Source Files">
<UniqueIdentifier>{0f90f0cf-9a13-4055-90f2-5c8b80aba249}</UniqueIdentifier>
</Filter>
<Filter Include="OAuth">
<UniqueIdentifier>{6797b6a3-b9dd-425e-ae58-45b576ab97d3}</UniqueIdentifier>
</Filter>
<Filter Include="OAuth\Header Files">
<UniqueIdentifier>{bffddf0a-4a1c-4eae-a480-07d13ace43f5}</UniqueIdentifier>
</Filter>
<Filter Include="OAuth\Source Files">
<UniqueIdentifier>{da0c5b8c-7b26-41a5-b675-68f350009ff3}</UniqueIdentifier>
=======
<UniqueIdentifier>{18558ae8-7be3-4a45-b3bc-ac31715c8f3c}</UniqueIdentifier>
</Filter>
<Filter Include="NetCore\Header Files">
@@ -327,7 +168,6 @@
</Filter>
<Filter Include="UDPServer\Source Files">
<UniqueIdentifier>{d70705a8-5176-4078-825e-1dc5086f7635}</UniqueIdentifier>
>>>>>>> a9571b2... regenerate Net VS solutions
</Filter>
</ItemGroup>
<ItemGroup>
@@ -511,16 +351,11 @@
<ClInclude Include="src\OAuthTestSuite.h">
<Filter>OAuth\Header Files</Filter>
</ClInclude>
<<<<<<< HEAD
<ClInclude Include="src\PollSetTest.h">
<Filter>Sockets\Header Files</Filter>
=======
<ClInclude Include="src\UDPServerTest.h">
<Filter>UDPServer\Header Files</Filter>
</ClInclude>
<ClInclude Include="src\UDPServerTestSuite.h">
<Filter>UDPServer\Header Files</Filter>
>>>>>>> a9571b2... regenerate Net VS solutions
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -707,16 +542,11 @@
<ClCompile Include="src\OAuthTestSuite.cpp">
<Filter>OAuth\Source Files</Filter>
</ClCompile>
<<<<<<< HEAD
<ClCompile Include="src\PollSetTest.cpp">
<Filter>Sockets\Source Files</Filter>
=======
<ClCompile Include="src\UDPServerTest.cpp">
<Filter>UDPServer\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\UDPServerTestSuite.cpp">
<Filter>UDPServer\Source Files</Filter>
>>>>>>> a9571b2... regenerate Net VS solutions
</ClCompile>
</ItemGroup>
</Project>

View File

@@ -119,7 +119,7 @@ void SocketAddressTest::testSocketAddress()
}
SocketAddress sa10("www6.pocoproject.org", 80);
assertTrue (sa10.host().toString() == "104.130.199.50" || sa10.host().toString() == "[2001:4801:7819:74:be76:4eff:fe10:6b73]");
assertTrue (sa10.host().toString() == "104.130.199.50" || sa10.host().toString() == "[2001:4801:7828:101:be76:4eff:fe10:1455]");
SocketAddress sa11(SocketAddress::IPv4, "www6.pocoproject.org", 80);
assertTrue (sa11.host().toString() == "104.130.199.50");
@@ -128,7 +128,7 @@ void SocketAddressTest::testSocketAddress()
try
{
SocketAddress sa12(SocketAddress::IPv6, "www6.pocoproject.org", 80);
assertTrue (sa12.host().toString() == "2001:4801:7819:74:be76:4eff:fe10:6b73");
assertTrue (sa12.host().toString() == "2001:4801:7828:101:be76:4eff:fe10:1455");
}
catch (AddressFamilyMismatchException&)
{

Submodule openssl updated: 26b1673caa...81a16d459e