Correct imap_timeout and smtp_timeout description, so 0 doesn't mean

no limit, but default_socket_timeout use (#1489247)
pull/102/merge
Aleksander Machniak 11 years ago
parent a79017e662
commit bc94e296e7

@ -143,7 +143,7 @@ $config['imap_force_ns'] = false;
// Note: Because the list is cached, re-login is required after change. // Note: Because the list is cached, re-login is required after change.
$config['imap_disabled_caps'] = array(); $config['imap_disabled_caps'] = array();
// IMAP connection timeout, in seconds. Default: 0 (no limit) // IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
$config['imap_timeout'] = 0; $config['imap_timeout'] = 0;
// Optional IMAP authentication identifier to be used as authorization proxy // Optional IMAP authentication identifier to be used as authorization proxy
@ -208,7 +208,7 @@ $config['smtp_auth_pw'] = null;
// localhost if that isn't defined. // localhost if that isn't defined.
$config['smtp_helo_host'] = ''; $config['smtp_helo_host'] = '';
// SMTP connection timeout, in seconds. Default: 0 (no limit) // SMTP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
// Note: There's a known issue where using ssl connection with // Note: There's a known issue where using ssl connection with
// timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511) // timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
$config['smtp_timeout'] = 0; $config['smtp_timeout'] = 0;

Loading…
Cancel
Save