6 files changed, 18 insertions, 0 deletions

diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 7144f13..bf5fa40 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/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/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index 8c2309c..6323def 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/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/linden/indra/llmessage/llmessage.vcproj b/linden/indra/llmessage/llmessage.vcproj
index dcc1202..64551bd 100644
--- a/linden/indra/llmessage/llmessage.vcproj
+++ b/linden/indra/llmessage/llmessage.vcproj
@@ -64,6 +64,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
+                                AdditionalOptions="/Oy-"
                                 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
                                 RuntimeLibrary="0"
@@ -106,6 +107,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
+                                AdditionalOptions="/Oy-"
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
diff --git a/linden/indra/llmessage/llmessage_vc8.vcproj b/linden/indra/llmessage/llmessage_vc8.vcproj
index eec76e5..e16a52a 100644
--- a/linden/indra/llmessage/llmessage_vc8.vcproj
+++ b/linden/indra/llmessage/llmessage_vc8.vcproj
@@ -109,6 +109,7 @@
                         />

                         <Tool

                                 Name="VCCLCompilerTool"

+                                AdditionalOptions="/Oy-"

                                 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"

                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

                                 RuntimeLibrary="0"

@@ -175,6 +176,7 @@
                         />

                         <Tool

                                 Name="VCCLCompilerTool"

+                                AdditionalOptions="/Oy-"

                                 Optimization="0"

                                 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"

                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index 857f804..8df4be4 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/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/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index f335316..4b12e71 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -69,6 +69,7 @@ public:
         enum ERequestAction
         {
                 INVALID,
+                HTTP_HEAD,
                 HTTP_GET,
                 HTTP_PUT,
                 HTTP_POST,