RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oops, invalid when http-proxy is empty

This commit is contained in:
David Rose 2003-04-28 19:48:04 +00:00
parent a345cfe8c5
commit 08a3129692
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
panda/src/downloader/httpClient.cxx
View File

@ -365,32 +365,35 @@ clear_proxy() {
////////////////////////////////////////////////////////////////////
void HTTPClient::
add_proxy(const string &scheme, const URLSpec &proxy) {
URLSpec proxy_url(proxy);
if (!proxy.empty()) {
URLSpec proxy_url(proxy);
// The scheme is always converted to lowercase.
string lc_scheme;
lc_scheme.reserve(scheme.length());
for (string::const_iterator si = scheme.begin(); si != scheme.end(); ++si) {
lc_scheme += tolower(*si);
// The scheme is always converted to lowercase.
string lc_scheme;
lc_scheme.reserve(scheme.length());
string::const_iterator si;
for (si = scheme.begin(); si != scheme.end(); ++si) {
lc_scheme += tolower(*si);
}
// Remove the trailing colon, if there is one.
if (!lc_scheme.empty() && lc_scheme[lc_scheme.length() - 1] == ':') {
lc_scheme = lc_scheme.substr(0, lc_scheme.length() - 1);
}
if (lc_scheme == "socks") {
// Scheme "socks" implies we talk to the proxy via the "socks"
// scheme, no matter what scheme the user actually specified.
proxy_url.set_scheme("socks");
} else if (!proxy_url.has_scheme()) {
// Otherwise, if the user didn't specify a scheme to talk to the
// proxy, the default is "http".
proxy_url.set_scheme("http");
}
_proxies_by_scheme[lc_scheme].push_back(proxy_url);
}
// Remove the trailing colon, if there is one.
if (!lc_scheme.empty() && lc_scheme[lc_scheme.length() - 1] == ':') {
lc_scheme = lc_scheme.substr(0, lc_scheme.length() - 1);
}
if (lc_scheme == "socks") {
// Scheme "socks" implies we talk to the proxy via the "socks"
// scheme, no matter what scheme the user actually specified.
proxy_url.set_scheme("socks");
} else if (!proxy_url.has_scheme()) {
// Otherwise, if the user didn't specify a scheme to talk to the
// proxy, the default is "http".
proxy_url.set_scheme("http");
}
_proxies_by_scheme[lc_scheme].push_back(proxy_url);
}
////////////////////////////////////////////////////////////////////