diff options
author | Adam Williamson <awilliam@redhat.com> | 2014-01-31 10:59:23 -0800 |
---|---|---|
committer | Adam Williamson <awilliam@redhat.com> | 2014-11-06 18:47:11 -0800 |
commit | 18707f5abaea9d1e55109a3847dff7bb1430799e (patch) | |
tree | 8bbdeaf150ae72b607b66db04b82e1461881a9f1 /apps/files_external/3rdparty | |
parent | d96c06f1a3266a2474c304e45f4c00fe65b44df4 (diff) | |
download | nextcloud-server-18707f5abaea9d1e55109a3847dff7bb1430799e.tar.gz nextcloud-server-18707f5abaea9d1e55109a3847dff7bb1430799e.zip |
fix a bug in google-api-php-client: generates an auth url that doesn't work
Submitted upstream as https://github.com/google/google-api-php-client/issues/76
Google's php lib has a function to generate a URL for OAuth2 authentication.
It uses http_build_query() to generate the query part of the URL, and in PHP
5.3 or later, this uses an encoded ampersand - & - as the query separator,
not a raw one. However, Google's OAuth server apparently can't handle encoded
ampersands as separators and so it fails.
This patch explicitly sets a raw ampersand as the separator. If Google decides
to fix their OAuth server instead of merging this patch into google-api-php-
client, we can drop this patch as soon as that happens.
Diffstat (limited to 'apps/files_external/3rdparty')
-rw-r--r-- | apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php index e66f34c1efd..6cf7c1a190f 100644 --- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php +++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php @@ -161,7 +161,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract $params['state'] = $this->state; } - return self::OAUTH2_AUTH_URL . "?" . http_build_query($params); + return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&'); } /** |