summaryrefslogtreecommitdiff
path: root/indra/llmessage/llurlrequest.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:39:31 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:39:31 -0400
commit60bceb759b592348b403689ffa8ed9c768126f8b (patch)
tree33b0ece80cc12f390683d89c30f2a706fa87bd50 /indra/llmessage/llurlrequest.cpp
parentc9c192e2c476e73807d23cdda0814cb221a96b95 (diff)
parente2baffa940a5797f2055f13ceb9722de524b2ec3 (diff)
merge changes for storm-954
Diffstat (limited to 'indra/llmessage/llurlrequest.cpp')
-rw-r--r--indra/llmessage/llurlrequest.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index cb9d1c3731..28bd09fc4c 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -440,6 +440,9 @@ bool LLURLRequest::configure()
case HTTP_GET:
mDetail->mCurlRequest->setopt(CURLOPT_HTTPGET, 1);
mDetail->mCurlRequest->setopt(CURLOPT_FOLLOWLOCATION, 1);
+
+ // Set Accept-Encoding to allow response compression
+ mDetail->mCurlRequest->setoptString(CURLOPT_ENCODING, "");
rv = true;
break;
@@ -464,6 +467,9 @@ bool LLURLRequest::configure()
// Set the handle for an http post
mDetail->mCurlRequest->setPost(NULL, bytes);
+
+ // Set Accept-Encoding to allow response compression
+ mDetail->mCurlRequest->setoptString(CURLOPT_ENCODING, "");
rv = true;
break;