From a83124209553318d1f044d543235114a82223ace Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sat, 27 Mar 2021 13:52:05 +0100
Subject: [PATCH 1/2] Workaround for cURL troubles in container environments
 Addresses https://github.com/friendica/docker/issues/134

---
 src/Core/Installer.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 2824b072c4..58cd713435 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -546,7 +546,6 @@ class Installer
 	 *
 	 * @param string $baseurl The baseurl of the app
 	 * @return bool false if something required failed
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function checkHtAccess($baseurl)
 	{
@@ -563,14 +562,16 @@ class Installer
 
 			if ($fetchResult->getReturnCode() != 204) {
 				$status = false;
-				$help = DI::l10n()->t('Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess.');
+				$help = DI::l10n()->t('Url rewrite in .htaccess seems not working. Make sure you copied .htaccess-dist to .htaccess.');
+				$help .= DI::l10n()->t('In some circumstances (like running inside containers), you can skip this error.');
 				$error_msg = [];
 				$error_msg['head'] = DI::l10n()->t('Error message from Curl when fetching');
 				$error_msg['url'] = $fetchResult->getRedirectUrl();
 				$error_msg['msg'] = $fetchResult->getError();
 			}
 
-			$this->addCheck(DI::l10n()->t('Url rewrite is working'), $status, true, $help, $error_msg);
+			/// @TODO Required false because of cURL issues in containers - see https://github.com/friendica/docker/issues/134
+			$this->addCheck(DI::l10n()->t('Url rewrite is working'), $status, false, $help, $error_msg);
 		} else {
 			// cannot check modrewrite if libcurl is not installed
 			/// @TODO Maybe issue warning here?

From 3327e6d979771a53f774d50d38a70285ac01a4ba Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sat, 27 Mar 2021 13:59:32 +0100
Subject: [PATCH 2/2] Add EOL to help string

---
 src/Core/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 58cd713435..de75aa374f 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -562,7 +562,7 @@ class Installer
 
 			if ($fetchResult->getReturnCode() != 204) {
 				$status = false;
-				$help = DI::l10n()->t('Url rewrite in .htaccess seems not working. Make sure you copied .htaccess-dist to .htaccess.');
+				$help = DI::l10n()->t('Url rewrite in .htaccess seems not working. Make sure you copied .htaccess-dist to .htaccess.') . EOL;
 				$help .= DI::l10n()->t('In some circumstances (like running inside containers), you can skip this error.');
 				$error_msg = [];
 				$error_msg['head'] = DI::l10n()->t('Error message from Curl when fetching');