TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-19 05:06:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

connect-timeout -> http-connect-timeout

Browse Source
This commit is contained in:
David Rose 2003-09-19 15:54:57 +00:00
parent 1392673881
commit 083370fffb
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/downloader/config_downloader.cxx
View File

@ -96,15 +96,14 @@ const bool http_proxy_tunnel =
config_downloader.GetBool("http-proxy-tunnel", false); config_downloader.GetBool("http-proxy-tunnel", false);
// This is the default amount of time to wait for a TCP/IP connection // This is the default amount of time to wait for a TCP/IP connection
// to be established, in seconds. It is presently only used for // to be established, in seconds.
// nonblocking sockets. const double http_connect_timeout =
const double connect_timeout = config_downloader.GetDouble("http-connect-timeout", 10.0);
config_downloader.GetDouble("connect-timeout", 5.0);
// This is the default amount of time to wait for the HTTP server to // This is the default amount of time to wait for the HTTP server to
// finish sending its response to our request, in seconds. It starts // finish sending its response to our request, in seconds. It starts
// counting after the TCP connection has been established // counting after the TCP connection has been established
// (connect_timeout, above) and the request has been sent. // (http_connect_timeout, above) and the request has been sent.
const double http_timeout = const double http_timeout =
config_downloader.GetDouble("http-timeout", 20.0); config_downloader.GetDouble("http-timeout", 20.0);

2
panda/src/downloader/config_downloader.h
View File

@ -48,7 +48,7 @@ extern const string http_direct_hosts;
extern const bool http_try_all_direct; extern const bool http_try_all_direct;
extern const string http_proxy_username; extern const string http_proxy_username;
extern const bool http_proxy_tunnel; extern const bool http_proxy_tunnel;
extern const double connect_timeout; extern const double http_connect_timeout;
extern const double http_timeout; extern const double http_timeout;
extern const int http_max_connect_count; extern const int http_max_connect_count;
extern const string http_client_certificate_filename; extern const string http_client_certificate_filename;

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

@ -51,7 +51,7 @@ HTTPChannel(HTTPClient *client) :
_persistent_connection = false; _persistent_connection = false;
_allow_proxy = true; _allow_proxy = true;
_proxy_tunnel = http_proxy_tunnel; _proxy_tunnel = http_proxy_tunnel;
_connect_timeout = connect_timeout; _connect_timeout = http_connect_timeout;
_http_timeout = http_timeout; _http_timeout = http_timeout;
_blocking_connect = false; _blocking_connect = false;
_download_throttle = false; _download_throttle = false;