bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10086 from nupplaphil/feat/install_testrewrite

Browse source 
Workaround for cURL troubles in container environments
This commit is contained in:
Hypolite Petovan 2021-03-27 09:20:55 -04:00 committed by GitHub
parent 4b52da84c3 3327e6d979
commit d936cc5a5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Core/Installer.php
View file

@ -546,7 +546,6 @@ class Installer
* *
* @param string $baseurl The baseurl of the app * @param string $baseurl The baseurl of the app
* @return bool false if something required failed * @return bool false if something required failed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function checkHtAccess($baseurl) public function checkHtAccess($baseurl)
{ {
@ -563,14 +562,16 @@ class Installer
if ($fetchResult->getReturnCode() != 204) { if ($fetchResult->getReturnCode() != 204) {
$status = false; $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.') . EOL;
$help .= DI::l10n()->t('In some circumstances (like running inside containers), you can skip this error.');
$error_msg = []; $error_msg = [];
$error_msg['head'] = DI::l10n()->t('Error message from Curl when fetching'); $error_msg['head'] = DI::l10n()->t('Error message from Curl when fetching');
$error_msg['url'] = $fetchResult->getRedirectUrl(); $error_msg['url'] = $fetchResult->getRedirectUrl();
$error_msg['msg'] = $fetchResult->getError(); $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 { } else {
// cannot check modrewrite if libcurl is not installed // cannot check modrewrite if libcurl is not installed
/// @TODO Maybe issue warning here? /// @TODO Maybe issue warning here?