merge changes for 3.7.2-release

1 files changed, 15 insertions, 6 deletions

diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index de9e2fe294..683065357d 100755
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -150,16 +150,19 @@ std::string LLURLRequest::actionAsVerb(LLURLRequest::ERequestAction action)
 	return VERBS[action];
 }
 
-LLURLRequest::LLURLRequest(LLURLRequest::ERequestAction action) :
-	mAction(action)
+LLURLRequest::LLURLRequest(LLURLRequest::ERequestAction action, bool follow_redirects /* = true */) :
+	mAction(action),
+	mFollowRedirects(follow_redirects)
 {
 	initialize();
 }
 
 LLURLRequest::LLURLRequest(
 	LLURLRequest::ERequestAction action,
-	const std::string& url) :
-	mAction(action)
+	const std::string& url,
+	bool follow_redirects /* = true */) :
+	mAction(action),
+	mFollowRedirects(follow_redirects)
 {
 	initialize();
 	setURL(url);
@@ -479,12 +482,18 @@ bool LLURLRequest::configure()
 	case HTTP_HEAD:
 		mDetail->mCurlRequest->setopt(CURLOPT_HEADER, 1);
 		mDetail->mCurlRequest->setopt(CURLOPT_NOBODY, 1);
-		mDetail->mCurlRequest->setopt(CURLOPT_FOLLOWLOCATION, 1);
+		if (mFollowRedirects)
+		{
+			mDetail->mCurlRequest->setopt(CURLOPT_FOLLOWLOCATION, 1);
+		}
 		rv = true;
 		break;
 	case HTTP_GET:
 		mDetail->mCurlRequest->setopt(CURLOPT_HTTPGET, 1);
-		mDetail->mCurlRequest->setopt(CURLOPT_FOLLOWLOCATION, 1);
+		if (mFollowRedirects)
+		{
+			mDetail->mCurlRequest->setopt(CURLOPT_FOLLOWLOCATION, 1);
+		}
 
 		// Set Accept-Encoding to allow response compression
 		mDetail->mCurlRequest->setoptString(CURLOPT_ENCODING, "");