diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-01-13 05:25:28 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-01-13 05:25:28 +0300 |
| commit | 67e0bd980ad8517dd0b47d4307e1ce3e39e90413 (patch) | |
| tree | 7ee39e54cc020b382a158b597eb2b03776588bb9 /core/Http.php | |
| parent | e2b9956e4bd92ca9e234d10d527be9e8caf2b68f (diff) | |
Fix curl timeout not set completely: this could result in Piwik hang indefinitely on an HTTP request
More particularly, this resulted in the installation hanging at the second step (system check) when using PHP's built-in webserver.
Diffstat (limited to 'core/Http.php')
| -rw-r--r-- | core/Http.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/Http.php b/core/Http.php index 5f104fc9f0..2fa5bd3937 100644 --- a/core/Http.php +++ b/core/Http.php @@ -444,6 +444,7 @@ class Http // only get header info if not saving directly to file CURLOPT_HEADER => is_resource($file) ? false : true, CURLOPT_CONNECTTIMEOUT => $timeout, + CURLOPT_TIMEOUT => $timeout, ); // Case core:archive command is triggering archiving on https:// and the certificate is not valid if ($acceptInvalidSslCertificate) { |