Merge pull request #3710 from thisislawatts/fix/opt-out-of-forcing-https

fix: add opt of forceScheme(https)
pixelfed · Dec 2, 2022 · f776c79 · f776c79
2 parents c1dc3ec + d1dca5a
commit f776c79
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -40,7 +40,9 @@ class AppServiceProvider extends ServiceProvider
 	 */
 	public function boot()
 	{
-		URL::forceScheme('https');
+		if (preg_match("/^https/", env('APP_URL')) || env('APP_ENV') === 'production') {
+			URL::forceScheme('https');
+		}
 		Schema::defaultStringLength(191);
 		Paginator::useBootstrap();
 		Avatar::observe(AvatarObserver::class);