GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Remove debug call and change how connect_timeout is set

This commit is contained in:
Mikael Nordfeldth 2017-07-09 20:34:44 +02:00
parent f0480c34d7
commit fb492d4bb2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/httpclient.php
View File

@ -122,11 +122,12 @@ class HTTPClient extends HTTP_Request2
// responses... But the default in HTTP_Request2 is 0 for
// some reason and should probably be considered a valid value.
$this->config['timeout'] = common_config('http', 'timeout');
common_debug('Using HTTPClient timeout value of '._ve($this->config['timeout']));
} else {
common_log(LOG_ERR, 'config option http/timeout is not an integer value: '._ve(common_config('http', 'timeout')));
}
$this->config['connect_timeout'] = common_config('http', 'connect_timeout') ?: $this->config['connect_timeout'];
if (!empty(common_config('http', 'connect_timeout'))) {
$this->config['connect_timeout'] = common_config('http', 'connect_timeout');
}
$this->config['max_redirs'] = 10;
$this->config['follow_redirects'] = true;