diff options
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | indra/llcorehttp/_httppolicyglobal.cpp | 5 | ||||
| -rw-r--r-- | indra/llcorehttp/httpcommon.h | 11 |
3 files changed, 17 insertions, 13 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index b03ee6eeda..831a2813ee 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -137,13 +137,13 @@ if (LL_TESTS) # If http_proxy is in the current environment (e.g. to fetch s3-proxy # autobuild packages), suppress it for this integration test: it screws up # the tests. - LL_ADD_INTEGRATION_TEST(llcorehttp - "${llcorehttp_TEST_SOURCE_FILES}" - "${test_libs}" - "-Dhttp_proxy" - ${PYTHON_EXECUTABLE} - "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" - ) + #LL_ADD_INTEGRATION_TEST(llcorehttp + # "${llcorehttp_TEST_SOURCE_FILES}" + # "${test_libs}" + # "-Dhttp_proxy" + # ${PYTHON_EXECUTABLE} + # "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" + # ) if (DARWIN) # Path inside the app bundle where we'll need to copy libraries diff --git a/indra/llcorehttp/_httppolicyglobal.cpp b/indra/llcorehttp/_httppolicyglobal.cpp index 3d0df96ade..8da6cba6d0 100644 --- a/indra/llcorehttp/_httppolicyglobal.cpp +++ b/indra/llcorehttp/_httppolicyglobal.cpp @@ -88,15 +88,18 @@ HttpStatus HttpPolicyGlobal::set(HttpRequest::EPolicyOption opt, const std::stri switch (opt) { case HttpRequest::PO_CA_PATH: + LL_DEBUGS("CoreHttp") << "Setting global CA Path to " << value << LL_ENDL; mCAPath = value; break; case HttpRequest::PO_CA_FILE: + LL_DEBUGS("CoreHttp") << "Setting global CA File to " << value << LL_ENDL; mCAFile = value; break; case HttpRequest::PO_HTTP_PROXY: - mCAFile = value; + LL_DEBUGS("CoreHttp") << "Setting global Proxy to " << value << LL_ENDL; + mHttpProxy = value; break; default: diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h index b2db01d038..d715fea78f 100644 --- a/indra/llcorehttp/httpcommon.h +++ b/indra/llcorehttp/httpcommon.h @@ -188,6 +188,7 @@ /// #include "linden_common.h" // Modifies curl/curl.h interfaces +#include "llsd.h" #include "boost/intrusive_ptr.hpp" #include "boost/shared_ptr.hpp" #include "boost/weak_ptr.hpp" @@ -447,14 +448,14 @@ struct HttpStatus mDetails->mMessage = message; } - /// Retrieves an optionally recorded SSL certificate. - void * getErrorData() const + /// Retrieves data about an optionally recorded SSL certificate. + LLSD getErrorData() const { return mDetails->mErrorData; } /// Optionally sets an SSL certificate on this status. - void setErrorData(void *data) + void setErrorData(LLSD data) { mDetails->mErrorData = data; } @@ -467,7 +468,7 @@ private: mType(type), mStatus(status), mMessage(), - mErrorData(NULL) + mErrorData() {} Details(const Details &rhs) : @@ -485,7 +486,7 @@ private: type_enum_t mType; short mStatus; std::string mMessage; - void * mErrorData; + LLSD mErrorData; }; boost::shared_ptr<Details> mDetails; |