diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-08 17:03:24 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-08 17:03:24 -0400 |
| commit | b4c60f430332674e5dbdb672152e62d252e9a6e1 (patch) | |
| tree | c9fb6805638fc95ea0ca2c3ef28a41e915ad7f18 /indra/llmessage/llurlrequest.cpp | |
| parent | 3e53ade13e7c9e70ba67a1e845696712081f7651 (diff) | |
| parent | beeefb45269f45ea717f58b30a0985951ae23c20 (diff) | |
merge. pulled in sunshine-stable.
Diffstat (limited to 'indra/llmessage/llurlrequest.cpp')
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index f354f5ab5d..49cfef2771 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -47,11 +47,12 @@ const std::string CONTEXT_DEST_URI_SD_LABEL("dest_uri"); const std::string CONTEXT_TRANSFERED_BYTES("transfered_bytes"); +// These are defined in llhttpnode.h/llhttpnode.cpp +extern const std::string CONTEXT_REQUEST; +extern const std::string CONTEXT_RESPONSE; static size_t headerCallback(void* data, size_t size, size_t nmemb, void* user); - - /** * class LLURLRequestDetail */ @@ -479,7 +480,7 @@ bool LLURLRequest::configure() case HTTP_PUT: // Disable the expect http 1.1 extension. POST and PUT default // to turning this on, and I am not too sure what it means. - addHeader(HTTP_HEADER_EXPECT); + addHeader(HTTP_OUT_HEADER_EXPECT); mDetail->mCurlRequest->setopt(CURLOPT_UPLOAD, 1); mDetail->mCurlRequest->setopt(CURLOPT_INFILESIZE, bytes); @@ -489,11 +490,11 @@ bool LLURLRequest::configure() case HTTP_POST: // Disable the expect http 1.1 extension. POST and PUT default // to turning this on, and I am not too sure what it means. - addHeader(HTTP_HEADER_EXPECT); + addHeader(HTTP_OUT_HEADER_EXPECT); // Disable the content type http header. // *FIX: what should it be? - addHeader(HTTP_HEADER_CONTENT_TYPE); + addHeader(HTTP_OUT_HEADER_CONTENT_TYPE); // Set the handle for an http post mDetail->mCurlRequest->setPost(NULL, bytes); |