Merge pull request #632 from nextcloud/backport/629/stable31

Author: skjnldsv

index.php

@@ -519,8 +519,6 @@ private function getUpdateServerResponse(): array {
 			CURLOPT_RETURNTRANSFER => 1,
 			CURLOPT_URL => $updateURL,
 			CURLOPT_USERAGENT => 'Nextcloud Updater',
-			CURLOPT_FOLLOWLOCATION => 1,
-			CURLOPT_MAXREDIRS => 2,
 		]);
 
 		if ($this->getConfigOption('proxy') !== null) {
@@ -581,6 +579,8 @@ public function downloadUpdate(): void {
 		curl_setopt_array($ch, [
 			CURLOPT_FILE => $fp,
 			CURLOPT_USERAGENT => 'Nextcloud Updater',
+			CURLOPT_FOLLOWLOCATION => 1,
+			CURLOPT_MAXREDIRS => 2,
 		]);
 
 		if ($this->getConfigOption('proxy') !== null) {

lib/Updater.php

@@ -481,8 +481,6 @@ private function getUpdateServerResponse(): array {
 			CURLOPT_RETURNTRANSFER => 1,
 			CURLOPT_URL => $updateURL,
 			CURLOPT_USERAGENT => 'Nextcloud Updater',
-			CURLOPT_FOLLOWLOCATION => 1,
-			CURLOPT_MAXREDIRS => 2,
 		]);
 
 		if ($this->getConfigOption('proxy') !== null) {
@@ -543,6 +541,8 @@ public function downloadUpdate(): void {
 		curl_setopt_array($ch, [
 			CURLOPT_FILE => $fp,
 			CURLOPT_USERAGENT => 'Nextcloud Updater',
+			CURLOPT_FOLLOWLOCATION => 1,
+			CURLOPT_MAXREDIRS => 2,
 		]);
 
 		if ($this->getConfigOption('proxy') !== null) {