From 076517dc967ce0ca19c95da65df716d0708917c5 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 9 Aug 2018 17:01:02 +0200 Subject: [PATCH] Fix new pocoproject.org IPv6 address --- Net/testsuite/TestSuite_vs140.vcxproj.filters | 170 ------------------ Net/testsuite/src/SocketAddressTest.cpp | 4 +- openssl | 2 +- 3 files changed, 3 insertions(+), 173 deletions(-) diff --git a/Net/testsuite/TestSuite_vs140.vcxproj.filters b/Net/testsuite/TestSuite_vs140.vcxproj.filters index d2712680d..65ee13f24 100644 --- a/Net/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,165 +2,6 @@ -<<<<<<< HEAD - {5e1e1f88-22c0-4484-a36a-1f8a2525bc7c} - - - {94dd84a6-84bb-45b6-8e6d-cb10aef163a4} - - - {c7265eb0-37c9-4f92-b839-f6c19c318f23} - - - {82593b9c-4a42-4a10-b007-ecbdbe9c3d32} - - - {eef6d2c2-736d-46a5-aacf-ba7d4cf01f35} - - - {52ceb4a1-3040-4a62-910b-ee6dc8deb339} - - - {6df84e0a-4799-49d9-a216-d10e80f6c9e8} - - - {c1b49088-3758-49df-8952-0d26869d69df} - - - {bef15d71-e5e2-498c-aa44-0696d3cdac7d} - - - {2f1c42ac-9db7-4678-9c00-ef4bb191988d} - - - {c9539010-a2a9-4362-adb1-17d4e9221952} - - - {508317ba-1ed6-41ba-b208-e1d49ff83c9e} - - - {8391eb5c-ba64-449e-a028-d6ae63e5a4bc} - - - {e3068f1e-4c00-49c9-94e0-9ada9c57e1a5} - - - {26d83142-9d7f-416f-97e3-9a4942681919} - - - {241a2d3b-f616-4e8f-bfa8-8be331296ccd} - - - {3c82f0f9-aa12-41a6-b2cb-87b9c78d7eba} - - - {565e354b-b9f1-4113-bbcd-5d77b180d59d} - - - {ab211a4a-59f7-4b44-845f-0f70855913e0} - - - {1c0c2ca7-3b87-43c1-80f5-185cc4490bd1} - - - {b076bac7-7b9e-465e-8841-0fc30d546e72} - - - {de5b725d-c623-42ad-87ef-8f65c3d7c772} - - - {6d61d66a-14c2-467d-94ab-c68c98507bfc} - - - {45dafc49-4458-44f9-a1f1-fa3d0c15b7be} - - - {82cc4709-8e03-46f2-9f37-6faf394064f9} - - - {d633e0da-c96e-4d9a-b397-ca592bbe1436} - - - {0a6cafcd-313d-43d9-8acb-6b502839ece1} - - - {b38bc3b6-45e3-46de-ae83-cc9e21d50082} - - - {b3d5de8d-6793-4df7-bd4f-6b4a21c96bea} - - - {d01c2ec5-b57b-49dc-8cbb-0b6c2414000d} - - - {7132225e-f5c9-41de-b9ac-0bd51d6f993b} - - - {2efea61a-70d7-498c-ad9b-776636c73b8b} - - - {d313baf1-a67a-4c5a-a53e-3b8ceeeda871} - - - {fc3c5b0a-afda-4394-8326-68a512bd2aaa} - - - {9e8ec8f5-3fbc-46be-9e3f-e4911587687e} - - - {5da89b25-bfc0-4b6a-8dea-68669475c215} - - - {96458fd1-d9dc-4add-8cca-4c4864f0bdce} - - - {2cb5c2e9-03af-480e-b623-ddd8e0569cf4} - - - {6094eedd-5529-4a0a-a0be-28117c20f08d} - - - {84646ba0-8e9d-4234-9048-2197a8271a8a} - - - {79d5e6dc-db38-4e2e-b620-2c78d80b3e64} - - - {27310a66-5b33-4887-992b-75251d79873d} - - - {0f94d408-7cf1-4ee1-b903-de8ab6d17410} - - - {7c2edba9-aabf-41d8-bdb4-f4363dec8428} - - - {10758494-d098-4681-bb6f-32137498ed3d} - - - {16635dd8-b44d-4ad5-8340-9b9a22451c1c} - - - {1d0a9a24-f19e-49e1-991c-5a13c17e8797} - - - {90a187fe-7787-429e-8877-7cdeb04c4445} - - - {d5d5f4cd-c59d-497e-a27e-981f7cb25306} - - - {0f90f0cf-9a13-4055-90f2-5c8b80aba249} - - - {6797b6a3-b9dd-425e-ae58-45b576ab97d3} - - - {bffddf0a-4a1c-4eae-a480-07d13ace43f5} - - - {da0c5b8c-7b26-41a5-b675-68f350009ff3} -======= {18558ae8-7be3-4a45-b3bc-ac31715c8f3c} @@ -327,7 +168,6 @@ {d70705a8-5176-4078-825e-1dc5086f7635} ->>>>>>> a9571b2... regenerate Net VS solutions @@ -511,16 +351,11 @@ OAuth\Header Files -<<<<<<< HEAD - - Sockets\Header Files -======= UDPServer\Header Files UDPServer\Header Files ->>>>>>> a9571b2... regenerate Net VS solutions @@ -707,16 +542,11 @@ OAuth\Source Files -<<<<<<< HEAD - - Sockets\Source Files -======= UDPServer\Source Files UDPServer\Source Files ->>>>>>> a9571b2... regenerate Net VS solutions \ No newline at end of file diff --git a/Net/testsuite/src/SocketAddressTest.cpp b/Net/testsuite/src/SocketAddressTest.cpp index de8859b48..55c5feefb 100644 --- a/Net/testsuite/src/SocketAddressTest.cpp +++ b/Net/testsuite/src/SocketAddressTest.cpp @@ -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&) { diff --git a/openssl b/openssl index 26b1673ca..81a16d459 160000 --- a/openssl +++ b/openssl @@ -1 +1 @@ -Subproject commit 26b1673caad94a702b6d694f48f917a283b30777 +Subproject commit 81a16d459e05794e685be9cf97af3b01c908f992