livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Microsoft is not nearly picky enough. Headder issues caught by gcc MS likes fine.

master
Rider Linden 2015-03-23 14:48:34 -07:00
parent 90ae8b84c6
commit d46fe1a1bb
4 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcorehttp/httpcommon.h
View File

@ -189,6 +189,7 @@
#include "linden_common.h" // Modifies curl/curl.h interfaces
#include "boost/intrusive_ptr.hpp"
#include "boost/shared_ptr.hpp"
#include <string>
namespace LLCore

2
indra/llcorehttp/httprequest.h
View File

@ -97,7 +97,7 @@ public:
typedef unsigned int policy_t;
typedef unsigned int priority_t;
typedef std::shared_ptr<HttpRequest> ptr_t;
typedef boost::shared_ptr<HttpRequest> ptr_t;
public:
/// @name PolicyMethods
/// @{

2
indra/llcorehttp/httpresponse.h
View File

@ -72,7 +72,7 @@ public:
/// Statistics for the HTTP
struct TransferStats
{
typedef std::shared_ptr<TransferStats> ptr_t;
typedef boost::shared_ptr<TransferStats> ptr_t;
TransferStats() : mSizeDownload(0.0), mTotalTime(0.0), mSpeedDownload(0.0) {}
F64 mSizeDownload;

45
indra/llmessage/llhttpclient.cpp
View File

@ -218,51 +218,6 @@ void LLHTTPClient::setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback cal
LLHTTPClient::mCertVerifyCallback = callback;
}
#if 0
typedef std::shared_ptr<LLCore::HttpRequest> HttpRequestPtr_t;
typedef std::unique_ptr<LLCore::HttpOptions> HttpOptionsPtr_t;
typedef std::unique_ptr<Injector> InjectorPtr_t;
static void request_(
const std::string& url,
EHTTPMethod method,
Injector* body_injector,
LLCurl::ResponderPtr responder,
const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
const LLSD& headers = LLSD(),
bool follow_redirects = true
)
{
HttpRequestPtr_t httpReq = HttpRequestPtr_t(new LLCore::HttpRequest());
HttpOptionsPtr_t httpOpts = HttpOptionsPtr_t(new LLCore::HttpOptions());
httpOpts->setFollowRedirects(follow_redirects);
httpOpts->setRetries(12);
httpOpts->setUseRetryAfter(true);
// for the moment lets just truncate. 60 seconds vs 60.5 seconds
httpOpts->setTransferTimeout((unsigned int)timeout);
switch (method)
{
case HTTP_GET:
httpReq->requestGet(0, 0, url, httpOpts.get(), headers, handler);
break;
case HTTP_HEAD:
httpReq->requestHead(0, 0, url, httpOpts.get(), headers, handler);
break;
case HTTP_PUT:
httpReq->requestPut(0, 0, url, );
break;
case HTTP_POST:
httpReq->requestPost(0, 0, url, null, httpOpts.get(), headers, handler);
break;
}
}
#endif
static void request(
const std::string& url,
EHTTPMethod method,