summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-07-30 17:13:27 -0700
committerMonroe Linden <monroe@lindenlab.com>2010-07-30 17:13:27 -0700
commit6833a97c94dd0a08bbd9981b5ce96195039385c9 (patch)
tree34b89dd2d4b23d632765570f5e8b2f2da6ba7f7c
parent81817394716c2666d373f0ea71796c0176c5c27f (diff)
Fix for EXT-8533
When sending the MIME type probe, tell LLCurl to allow cookies in the response. This works around an issue with some sites that will get into an infinite redirect loop when cookies are disabled.
-rw-r--r--indra/newview/llviewermedia.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 55f180c0d9..99220e288c 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2308,6 +2308,8 @@ void LLViewerMediaImpl::navigateInternal()
// which is really not what we want.
LLSD headers = LLSD::emptyMap();
headers["Accept"] = "*/*";
+ // Allow cookies in the response, to prevent a redirect loop when accessing join.secondlife.com
+ headers["Cookie"] = "";
LLHTTPClient::getHeaderOnly( mMediaURL, new LLMimeDiscoveryResponder(this), headers, 10.0f);
}
else if("data" == scheme || "file" == scheme || "about" == scheme)