Merge branch 'develop' into 1706-lock

diff --cc boot.php
index b1f956fb2bf1c0ad22660c4074022ebf6e79d6e0,5f83cb3e40317dad8fd7ad767dd1eb4ba1bd1924..5e313073f057fda7420acdd765003a12995ca20b
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -39,9 -38,9 +39,9 @@@ require_once 'include/poller.php'
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
  define ( 'FRIENDICA_CODENAME',     'Asparagus');
- define ( 'FRIENDICA_VERSION',      '3.5.2-rc' );
+ define ( 'FRIENDICA_VERSION',      '3.5.3dev' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1227      );
 +define ( 'DB_UPDATE_VERSION',      1228      );
  
  /**
   * @brief Constant with a HTML line break.

diff --cc include/dbstructure.php
Simple merge

diff --cc include/poller.php
index b08d98ca75b225fc46eb66ffd97c7159d81fa9e1,0011559c6929a05417152f63b6522ef62c411391..a19d9dec8f70c31cb4f183ac6ea924f8ab6008ad
--- 1/include/poller.php
--- 2/include/poller.php
+++ b/include/poller.php
@@@ -391,7 -369,8 +391,8 @@@ function poller_kill_stale_workers() 
                        if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) {
                                $pid["priority"] = PRIORITY_MEDIUM;
                        }
-                       // Define the maximum durations
+ 
 -                      // Define the maximum durations
++      // Define the maximum durations
                        $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
                        $max_duration = $max_duration_defaults[$pid["priority"]];
  

diff --cc include/pubsubpublish.php
Simple merge

diff --cc include/queue.php
Simple merge