From da05a3770f65bb1404c80edda7ac0df46b0670f8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 23 Apr 2022 18:03:25 +0100
Subject: [PATCH] Use address of www.wxwidgets.org instead of its name in HTTP
 URLs

The name resolves to Cloudflare proxy which redirects all HTTP URLs to
HTTPS, which breaks the existing tests using HTTP, so prevent this from
happening by using the actual IP address instead.
---
 tests/image/image.cpp | 5 +++--
 tests/test.cpp        | 2 +-
 tests/uris/url.cpp    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/image/image.cpp b/tests/image/image.cpp
index 8272beb6d5..1f43fb810e 100644
--- a/tests/image/image.cpp
+++ b/tests/image/image.cpp
@@ -171,13 +171,14 @@ void ImageTestCase::LoadFromSocketStream()
         return;
     }
 
+    // These URLs use the real IP address of www.wxwidgets.org.
     struct {
         const char* url;
         wxBitmapType type;
     } testData[] =
     {
-        { "http://www.wxwidgets.org/assets/img/header-logo.png", wxBITMAP_TYPE_PNG },
-        { "http://www.wxwidgets.org/assets/ico/favicon-1.ico", wxBITMAP_TYPE_ICO }
+        { "http://173.254.92.22/assets/img/header-logo.png", wxBITMAP_TYPE_PNG },
+        { "http://173.254.92.22/assets/ico/favicon-1.ico", wxBITMAP_TYPE_ICO }
     };
 
     for (unsigned int i=0; i<WXSIZEOF(testData); i++)
diff --git a/tests/test.cpp b/tests/test.cpp
index 2a11bfb198..03636da8f3 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -436,7 +436,7 @@ static bool DoCheckConnection()
     wxSocketBase::Initialize();
 
     wxIPV4address addr;
-    if (!addr.Hostname(wxASCII_STR("www.wxwidgets.org")) || !addr.Service(wxASCII_STR("www")))
+    if (!addr.Hostname(0xadfe5c16) || !addr.Service(wxASCII_STR("www")))
     {
         wxSocketBase::Shutdown();
         return false;
diff --git a/tests/uris/url.cpp b/tests/uris/url.cpp
index 65c878aa1d..1cea125078 100644
--- a/tests/uris/url.cpp
+++ b/tests/uris/url.cpp
@@ -69,7 +69,8 @@ void URLTestCase::GetInputStream()
         return;
     }
 
-    wxURL url("http://www.wxwidgets.org/assets/img/header-logo.png");
+    // This is the IP address of the real www.wxwidgets.org server.
+    wxURL url("http://173.254.92.22/assets/img/header-logo.png");
     CPPUNIT_ASSERT_EQUAL(wxURL_NOERR, url.GetError());
 
     wxScopedPtr<wxInputStream> in_stream(url.GetInputStream());