summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorcallum@lindenlab.com <callum@lindenlab.com>2017-02-13 13:35:06 -0800
committercallum@lindenlab.com <callum@lindenlab.com>2017-02-13 13:35:06 -0800
commit189c0430383aa92fe839d6ed144d916886360407 (patch)
treed2fae98d1f6ac03fdd39151c50b52c971deadf59 /indra/llcorehttp
parent238f9350b8fec05a170ce0cf93e50783b07a5abf (diff)
parenta971909a3429a8944387ede557ed46e939cf0e8f (diff)
Automated merge with lindenlab/viewer64
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/tests/test_httprequest.hpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp
index 6cd7960ecd..8b689e8c83 100644
--- a/indra/llcorehttp/tests/test_httprequest.hpp
+++ b/indra/llcorehttp/tests/test_httprequest.hpp
@@ -3089,6 +3089,10 @@ void HttpRequestTestObjectType::test<23>()
set_test_name("HttpRequest GET 503s with 'Retry-After'");
+#if LL_WINDOWS && ADDRESS_SIZE == 64:
+ skip("llcorehttp 503-with-retry test hangs on Windows 64");
+#endif
+
// This tests mainly that the code doesn't fall over if
// various well- and mis-formed Retry-After headers are
// sent along with the response. Direct inspection of