wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

google: disable compression when curl is not available

Browse source 
This is a slightly hacky workaround for
https://github.com/google/google-api-php-client/issues/59 .
There's a bug in the Google library which makes it go nuts on
file uploads and transfer *way* too much data if compression is
enabled and it's using its own IO handler (not curl). Upstream
'fixed' this (by disabling compression) for one upload
mechanism, but not for the one we use. The bug doesn't seem to
happen if the google lib detects that curl is available and
decides to use it instead of its own handler. So, let's disable
compression, but only if it looks like the Google lib's check
for curl is going to fail.
This commit is contained in:
Adam Williamson 2014-11-07 22:52:07 -08:00
parent b3bccce267
commit c237acb395
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_external/lib/google.php
View file

@ -52,6 +52,12 @@ class Google extends \OC\Files\Storage\Common {
$this->client->setClientSecret($params['client_secret']);
$this->client->setScopes(array('https://www.googleapis.com/auth/drive'));
$this->client->setAccessToken($params['token']);
// if curl isn't available we're likely to run into
// https://github.com/google/google-api-php-client/issues/59
// - disable gzip to avoid it.
if (!function_exists('curl_version') || !function_exists('curl_exec')) {
$this->client->setClassConfig("Google_Http_Request", "disable_gzip", true);
}
// note: API connection is lazy
$this->service = new \Google_Service_Drive($this->client);
$token = json_decode($params['token'], true);