diff options
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llhttpclient.cpp | 5 | ||||
| -rw-r--r-- | indra/llmessage/llhttpclient.h | 1 | ||||
| -rw-r--r-- | indra/llmessage/lltemplatemessagereader.cpp | 6 | ||||
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 7 | ||||
| -rw-r--r-- | indra/llmessage/llurlrequest.h | 1 |
5 files changed, 17 insertions, 3 deletions
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index 7144f1313e..bf5fa4073d 100644 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -325,6 +325,11 @@ static void request( request(url, method, body_injector, responder, LLSD(), timeout); } +void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F32 timeout) +{ + request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout); +} + void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout) { request(url, LLURLRequest::HTTP_GET, NULL, responder, headers, timeout); diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h index 8c2309ccca..6323defb76 100644 --- a/indra/llmessage/llhttpclient.h +++ b/indra/llmessage/llhttpclient.h @@ -89,6 +89,7 @@ public: typedef boost::intrusive_ptr<Responder> ResponderPtr; + static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); static void get(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); static void get(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); static void get(const std::string& url, const LLSD& query, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS); diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp index 114c312aea..f9b703b52a 100644 --- a/indra/llmessage/lltemplatemessagereader.cpp +++ b/indra/llmessage/lltemplatemessagereader.cpp @@ -753,9 +753,9 @@ BOOL LLTemplateMessageReader::validateMessage(const U8* buffer, if(result) { mCurrentRMessageTemplate->mReceiveCount++; - lldebugst(LLERR_MESSAGE) << "MessageRecvd:" - << mCurrentRMessageTemplate->mName - << " from " << sender << llendl; + //lldebugs << "MessageRecvd:" + // << mCurrentRMessageTemplate->mName + // << " from " << sender << llendl; } return result; } diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index 6a09a8bbec..42a64bdede 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -428,6 +428,13 @@ bool LLURLRequest::configure() NULL); switch(mAction) { + case HTTP_HEAD: + curl_easy_setopt(mDetail->mCurl, CURLOPT_HEADER, 1); + curl_easy_setopt(mDetail->mCurl, CURLOPT_NOBODY, 1); + curl_easy_setopt(mDetail->mCurl, CURLOPT_FOLLOWLOCATION, 1); + rv = true; + break; + case HTTP_GET: curl_easy_setopt(mDetail->mCurl, CURLOPT_HTTPGET, 1); curl_easy_setopt(mDetail->mCurl, CURLOPT_FOLLOWLOCATION, 1); diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h index 7cb6b6a618..5bdb6a1e69 100644 --- a/indra/llmessage/llurlrequest.h +++ b/indra/llmessage/llurlrequest.h @@ -71,6 +71,7 @@ public: enum ERequestAction { INVALID, + HTTP_HEAD, HTTP_GET, HTTP_PUT, HTTP_POST, |