summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/_httplibcurl.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-09-24 14:35:26 -0400
committerNat Goodspeed <nat@lindenlab.com>2019-09-24 14:35:26 -0400
commit77621dd3fc99f4fb1285a929e0b56b019f6b65c2 (patch)
tree4de95909b29874f492206b090b2e233b8acb596c /indra/llcorehttp/_httplibcurl.cpp
parent8053bceaa0ccd6128536375c21cc3e9e19429efa (diff)
parente241670694959833feaa0e667222b337095eb683 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vs2017
Diffstat (limited to 'indra/llcorehttp/_httplibcurl.cpp')
-rw-r--r--indra/llcorehttp/_httplibcurl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp
index abd304f6a5..975ce8a4d5 100644
--- a/indra/llcorehttp/_httplibcurl.cpp
+++ b/indra/llcorehttp/_httplibcurl.cpp
@@ -355,7 +355,8 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode
}
if (op->mStatus)
{
- int http_status(HTTP_OK);
+ // note: CURLINFO_RESPONSE_CODE requires a long - https://curl.haxx.se/libcurl/c/CURLINFO_RESPONSE_CODE.html
+ long http_status(HTTP_OK);
if (handle)
{