diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2021-01-12 11:01:06 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2021-01-12 12:36:21 +0100 |
| commit | 41c80d6c19ee3bb0bb0bec43b3a030df8165430d (patch) | |
| tree | 0f09db5dab7217dfc12ed8ac1750710125d96fab /lib | |
| parent | 9b58a027e3312d14ee3cd724841ae32af481d03c (diff) | |
| download | nextcloud-server-41c80d6c19ee3bb0bb0bec43b3a030df8165430d.tar.gz nextcloud-server-41c80d6c19ee3bb0bb0bec43b3a030df8165430d.zip | |
Fix option in the client code itself as well
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Http/Client/Client.php | 18 | ||||
| -rw-r--r-- | lib/public/Http/Client/IClient.php | 12 |
2 files changed, 18 insertions, 12 deletions
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index 3f616df0b28..12d1efb45a2 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -95,6 +95,12 @@ class Client implements IClient { $options[RequestOptions::HEADERS]['Accept-Encoding'] = 'gzip'; } + // Fallback for save_to + if (isset($options['save_to'])) { + $options['sink'] = $options['save_to']; + unset($options['save_to']); + } + return $options; } @@ -218,7 +224,7 @@ class Client implements IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * 'timeout' => 5, @@ -249,7 +255,7 @@ class Client implements IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * 'timeout' => 5, @@ -284,7 +290,7 @@ class Client implements IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * 'timeout' => 5, @@ -324,7 +330,7 @@ class Client implements IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * 'timeout' => 5, @@ -359,7 +365,7 @@ class Client implements IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * 'timeout' => 5, @@ -394,7 +400,7 @@ class Client implements IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * 'timeout' => 5, diff --git a/lib/public/Http/Client/IClient.php b/lib/public/Http/Client/IClient.php index 4c50c1c6497..1498cfaaba2 100644 --- a/lib/public/Http/Client/IClient.php +++ b/lib/public/Http/Client/IClient.php @@ -55,7 +55,7 @@ interface IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * @return IResponse @@ -80,7 +80,7 @@ interface IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * @return IResponse @@ -110,7 +110,7 @@ interface IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * @return IResponse @@ -140,7 +140,7 @@ interface IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * @return IResponse @@ -170,7 +170,7 @@ interface IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * @return IResponse @@ -200,7 +200,7 @@ interface IClient { * 'referer' => true, // add a Referer header * 'protocols' => ['https'] // only allow https URLs * ], - * 'save_to' => '/path/to/file', // save to a file or a stream + * 'sink' => '/path/to/file', // save to a file or a stream * 'verify' => true, // bool or string to CA file * 'debug' => true, * @return IResponse |