Merge commit '5947769812369a7988a7f1db30df79e6fc0e4787'

Adds important commits from llwebprofile branch
into master which need to go into the next release.

indra/llmessage/aicurl.cpp

@@ -1347,11 +1347,22 @@ void BufferedCurlEasyRequest::prepRequest(AICurlEasyRequest_wat& curl_easy_reque
   curl_easy_request_w->setReadCallback(&curlReadCallback, lockobj);
   curl_easy_request_w->setHeaderCallback(&curlHeaderCallback, lockobj);
 
+  bool allow_cookies = headers.hasHeader("Cookie");
   // Allow up to ten redirects.
   if (responder->followRedir())
   {
 	curl_easy_request_w->setopt(CURLOPT_FOLLOWLOCATION, 1);
 	curl_easy_request_w->setopt(CURLOPT_MAXREDIRS, HTTP_REDIRECTS_DEFAULT);
+	// This is needed (at least) for authentication after temporary redirection
+	// to id.secondlife.com for marketplace.secondlife.com.
+	allow_cookies = true;
+  }
+  if (allow_cookies)
+  {
+	// Given an empty or non-existing file or by passing the empty string (""),
+	// this option will enable cookies for this curl handle, making it understand
+	// and parse received cookies and then use matching cookies in future requests.
+	curl_easy_request_w->setopt(CURLOPT_COOKIEFILE, "");
   }
 
   // Keep responder alive.

indra/llmessage/aicurlthread.cpp

@@ -2172,6 +2172,12 @@ void BufferedCurlEasyRequest::setStatusAndReason(U32 status, std::string const&
   mStatus = status;
   mReason = reason;
   AICurlInterface::Stats::status_count[AICurlInterface::Stats::status2index(mStatus)]++;
+
+  // Sanity check. If the server replies with a redirect status then we better have that option turned on!
+  if ((status >= 300 && status < 400) && mResponder && !mResponder->followRedir())
+  {
+	llerrs << "Received " << status << " (" << reason << ") for responder \"" << mTimeoutPolicy->name() << "\" which has no followRedir()!" << llendl;
+  }
 }
 
 void BufferedCurlEasyRequest::processOutput(void)

indra/llmessage/aihttptimeoutpolicy.cpp

@@ -889,6 +889,7 @@ P(viewerStatsResponder);
 P(viewerVoiceAccountProvisionResponder);
 P(voiceCallCapResponder);
 P(voiceClientCapResponder);
+P(webProfileResponders);
 P(wholeModelFeeResponder);
 P(wholeModelUploadResponder);
 P2(XMLRPCResponder,								connect_40s);

indra/llmessage/llhttpclient.h

@@ -161,7 +161,7 @@ public:
 
 		// A derived class should return true if curl should follow redirections.
 		// The default is not to follow redirections.
-		virtual bool followRedir(void) { return false; }
+		virtual bool followRedir(void) const { return false; }
 
 		// Timeout policy to use.
 		virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const = 0;
@@ -188,6 +188,7 @@ public:
 	class ResponderHeadersOnly : public ResponderBase {
 	private:
 		/*virtual*/ bool needsHeaders(void) const { return true; }
+		/*virtual*/ bool followRedir(void) const { return true; }
 
 	protected:
 		// ResponderBase event

indra/llmessage/llurlrequest.cpp

@@ -85,11 +85,6 @@ LLURLRequest::LLURLRequest(LLURLRequest::ERequestAction action, std::string cons
 
 void LLURLRequest::initialize_impl(void)
 {
-	if (mHeaders.hasHeader("Cookie"))
-	{
-		allowCookies();
-	}
-
 	// If the header is "Pragma" with no value, the caller intends to
 	// force libcurl to drop the Pragma header it so gratuitously inserts.
 	// Before inserting the header, force libcurl to not use the proxy.
@@ -105,7 +100,7 @@ void LLURLRequest::initialize_impl(void)
 		// but if they did not specify a Content-Type, then ask the injector.
 		mHeaders.addHeader("Content-Type", mBody->contentType(), AIHTTPHeaders::keep_existing_header);
 	}
-	else
+	else if (mAction != HTTP_HEAD)
 	{
 		// Check to see if we have already set Accept or not. If no one
 		// set it, set it to application/llsd+xml since that's what we
@@ -199,12 +194,6 @@ void LLURLRequest::useProxy(const std::string &proxy)
 }
 #endif
 
-void LLURLRequest::allowCookies()
-{
-	AICurlEasyRequest_wat curlEasyRequest_w(*mCurlEasyRequest);
-	curlEasyRequest_w->setoptString(CURLOPT_COOKIEFILE, "");
-}
-
 bool LLURLRequest::configure(AICurlEasyRequest_wat const& curlEasyRequest_w)
 {
 	bool rv = false;
@@ -213,13 +202,11 @@ bool LLURLRequest::configure(AICurlEasyRequest_wat const& curlEasyRequest_w)
 		{
 		case HTTP_HEAD:
 			curlEasyRequest_w->setopt(CURLOPT_NOBODY, 1);
-			curlEasyRequest_w->setopt(CURLOPT_FOLLOWLOCATION, 1);
 			rv = true;
 			break;
 
 		case HTTP_GET:
 			curlEasyRequest_w->setopt(CURLOPT_HTTPGET, 1);
-			curlEasyRequest_w->setopt(CURLOPT_FOLLOWLOCATION, 1);
 
 			// Set Accept-Encoding to allow response compression
 			curlEasyRequest_w->setoptString(CURLOPT_ENCODING, mNoCompression ? "identity" : "");

indra/llmessage/llurlrequest.h

@@ -84,11 +84,6 @@ class LLURLRequest : public AICurlEasyRequestStateMachine {
 	/*virtual*/ ~LLURLRequest() { }
 
   public:
-	/**
-	 * @brief Turn on cookie handling for this request with CURLOPT_COOKIEFILE.
-	 */
-	void allowCookies(void);
-
     /**
      * @ brief Turn off (or on) the CURLOPT_PROXY header.
      */