Merge pull request #631 from nextcloud/backport/629/stable30

Author: skjnldsv

index.php

@@ -536,8 +536,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) {
@@ -598,6 +596,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

@@ -498,8 +498,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) {
@@ -560,6 +558,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) {

updater.phar

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '0d7ecb7201963d7adb575991f83f392b8a425a61',
+        'reference' => '9adb775ee0ca02d832347ddfea2b4c248f2805bc',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '0d7ecb7201963d7adb575991f83f392b8a425a61',
+            'reference' => '9adb775ee0ca02d832347ddfea2b4c248f2805bc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),