From a31bdec750e6815b3cf62be7eb21965eb25b8d67 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 1 Dec 2022 20:59:57 -0700 Subject: [PATCH] Allow forceHttps to be disabled, fixes #3710 --- app/Providers/AppServiceProvider.php | 3 ++- config/instance.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 7f9d9fe16..f20f0c815 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -40,9 +40,10 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - if (preg_match("/^https/", env('APP_URL')) || env('APP_ENV') === 'production') { + if(config('instance.force_https_urls')) { URL::forceScheme('https'); } + Schema::defaultStringLength(191); Paginator::useBootstrap(); Avatar::observe(AvatarObserver::class); diff --git a/config/instance.php b/config/instance.php index 174baa81f..31adf4916 100644 --- a/config/instance.php +++ b/config/instance.php @@ -1,6 +1,7 @@ env('FORCE_HTTPS_URLS', true), 'description' => env('INSTANCE_DESCRIPTION', 'Pixelfed - Photo sharing for everyone'),