From eb1c3c5cbbbe687235dc7db2d527e04578ea1d54 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 8 Feb 2019 22:22:06 +0200
Subject: [PATCH] Fix for teamcity W64 build freeze.
---
indra/llcorehttp/tests/test_httprequest.hpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp
index b450f3502e6..4ac3f6f9911 100644
--- a/indra/llcorehttp/tests/test_httprequest.hpp
+++ b/indra/llcorehttp/tests/test_httprequest.hpp
@@ -2903,6 +2903,9 @@ void HttpRequestTestObjectType::test<22>()
set_test_name("BUG-2295");
+#if LL_WINDOWS && ADDRESS_SIZE == 64
+ skip("BUG-2295 - partial load on W64 causes freeze");
+#endif
// Handler can be stack-allocated *if* there are no dangling
// references to it after completion of this method.
// Create before memory record as the string copy will bump numbers.
@@ -2921,6 +2924,7 @@ void HttpRequestTestObjectType::test<22>()
// options set
options = HttpOptions::ptr_t(new HttpOptions());
options->setRetries(1); // Partial_File is retryable and can timeout in here
+ options->setDNSCacheTimeout(30);
// Get singletons created
HttpRequest::createService();
--
GitLab