Skip to content

Commit

Permalink
re #8924 forsce a better proxy url to solve mac crashes
Browse files Browse the repository at this point in the history
  • Loading branch information
NickDraper committed Nov 28, 2014
1 parent 84c7449 commit 3130053
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Kernel/src/InternetHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ int InternetHelper::sendHTTPSRequest(const std::string& url,
session.setTimeout(Poco::Timespan(m_timeout, 0)); // m_timeout seconds

// HACK:: Currently the automatic proxy detection only supports http proxy detection
// most locations use the same proxy for http and https, so for it to use the http proxy
// most locations use the same proxy for http and https, so force it to use the http proxy
std::string urlforProxy = ConfigService::Instance().getString("proxy.httpsTargetUrl");
if (urlforProxy.empty())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ curvefitting.findPeaksTolerance=4
# proxy.host =
# proxy.port = 8080
# This is to force https proxy requests to use the http proxy (current necessary)
proxy.httpsTargetUrl = "http://www.mantidproject.org"
proxy.httpsTargetUrl = http://www.mantidproject.org

# Defines the precision of h, k, and l when output in peak workspace table
PeakColumn.hklPrec=2
Expand Down

0 comments on commit 3130053

Please sign in to comment.