From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 20 Sep 2020 19:32:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'friendica/stable' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a852455d0ed9824fb71c9374c9fffda28f95096f;p=friendica.git

Merge remote-tracking branch 'friendica/stable' into develop

# Conflicts:
#	composer.lock
---

a852455d0ed9824fb71c9374c9fffda28f95096f
diff --cc bin/worker.php
index 46eff1071a,833e5b0020..5698cf16dd
--- a/bin/worker.php
+++ b/bin/worker.php
@@@ -21,9 -21,13 +21,14 @@@
   * Starts the background processing
   */
  
+ if (php_sapi_name() !== 'cli') {
+ 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+ 	exit();
+ }
+ 
  use Dice\Dice;
  use Friendica\App;
 +use Friendica\Core\Process;
  use Friendica\Core\Update;
  use Friendica\Core\Worker;
  use Friendica\DI;
diff --cc composer.lock
index ebd434e39e,fae71d6dcf..d2b5f74a21
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "ffe94190e166cebf80601fc3d6d26be0",
 -    "content-hash": "27203cc7da01ff668ba15e03fd17dc94",
++    "content-hash": "ed9aa898eaf8a1f8a807f3be9eecc3d7",
      "packages": [
          {
              "name": "asika/simple-console",