diff options
| author | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
| commit | e6765df1baa40a46b77e5362c8855a336125e5f7 (patch) | |
| tree | ffb3564aaa95b23f0d7ab6f6eeea8d08f3e9b317 /indra/llcorehttp | |
| parent | b0950991988ddd56bec9074316d883a00b0cae4c (diff) | |
| parent | 02342cb9ae3140cb49ec2818fee5692b3796bf8a (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/llcorehttp/_httppolicyglobal.cpp | 5 | ||||
| -rw-r--r-- | indra/llcorehttp/httpcommon.h | 11 |
3 files changed, 14 insertions, 6 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 40ec836f12..bff329f4a5 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -180,6 +180,10 @@ if (DARWIN) COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ${LL_TEST_DESTINATION_DIR} DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ) + add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libnghttp2*.dylib ${LL_TEST_DESTINATION_DIR} + DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libnghttp2.dylib + ) foreach(expat ${EXPAT_COPY}) add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} ${LL_TEST_DESTINATION_DIR} 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 ea0c38abd7..e4bd4957f8 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; |