From: Michael Vogel <icarus@dabo.de>
Date: Tue, 6 Jun 2017 12:16:00 +0000 (+0200)
Subject: Merge branch 'develop' into 1706-lock
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f4652d6e5026abe7d7b352d2307622bd567aa433;p=friendica.git

Merge branch 'develop' into 1706-lock
---

f4652d6e5026abe7d7b352d2307622bd567aa433
diff --cc boot.php
index b1f956fb2b,5f83cb3e40..5e313073f0
--- a/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/poller.php
index b08d98ca75,0011559c69..a19d9dec8f
--- a/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"]];