TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

whoops, timeout when connecting through proxy

Browse Source
This commit is contained in:
David Rose 2003-05-29 21:04:22 +00:00
parent 4c152dad0e
commit b2c04cf954
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
panda/src/downloader/httpChannel.cxx
View File

@ -799,6 +799,7 @@ run_http_proxy_ready() {
// All done sending request. // All done sending request.
_state = S_http_proxy_request_sent; _state = S_http_proxy_request_sent;
_sent_request_time = ClockObject::get_global_clock()->get_real_time();
return false; return false;
} }
@ -1318,13 +1319,20 @@ run_reading_header() {
_response_type = RT_http_hangup; _response_type = RT_http_hangup;
} }
} else if (ClockObject::get_global_clock()->get_real_time() - } else {
_sent_request_time > get_http_timeout()) { double elapsed =
ClockObject::get_global_clock()->get_real_time() -
_sent_request_time;
if (elapsed > get_http_timeout()) {
// Time to give up. // Time to give up.
downloader_cat.info() downloader_cat.info()
<< "Timeout waiting for " << _request.get_url().get_server_and_port() << ".\n"; << "Timeout waiting for "
<< _request.get_url().get_server_and_port()
<< " in run_reading_header (" << elapsed
<< " seconds elapsed).\n";
_state = S_try_next_proxy; _state = S_try_next_proxy;
} }
}
return true; return true;
} }
_response_type = RT_http_complete; _response_type = RT_http_complete;
@ -2041,13 +2049,20 @@ server_getline_failsafe(string &str) {
_response_type = RT_hangup; _response_type = RT_hangup;
} }
} else if (ClockObject::get_global_clock()->get_real_time() - } else {
_sent_request_time > get_http_timeout()) { double elapsed =
ClockObject::get_global_clock()->get_real_time() -
_sent_request_time;
if (elapsed > get_http_timeout()) {
// Time to give up. // Time to give up.
downloader_cat.info() downloader_cat.info()
<< "Timeout waiting for " << _request.get_url().get_server_and_port() << ".\n"; << "Timeout waiting for "
<< _request.get_url().get_server_and_port()
<< " in server_getline_failsafe (" << elapsed
<< " seconds elapsed).\n";
_state = S_try_next_proxy; _state = S_try_next_proxy;
} }
}
return false; return false;
} }
@ -2105,13 +2120,20 @@ server_get_failsafe(string &str, size_t num_bytes) {
_response_type = RT_hangup; _response_type = RT_hangup;
} }
} else if (ClockObject::get_global_clock()->get_real_time() - } else {
_sent_request_time > get_http_timeout()) { double elapsed =
ClockObject::get_global_clock()->get_real_time() -
_sent_request_time;
if (elapsed > get_http_timeout()) {
// Time to give up. // Time to give up.
downloader_cat.info() downloader_cat.info()
<< "Timeout waiting for " << _request.get_url().get_server_and_port() << ".\n"; << "Timeout waiting for "
<< _request.get_url().get_server_and_port()
<< " in server_get_failsafe (" << elapsed
<< " seconds elapsed).\n";
_state = S_try_next_proxy; _state = S_try_next_proxy;
} }
}
return false; return false;
} }