The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions

diff --git a/boot.php b/boot.php
index 0f93c5e6d86182c79d4f27eb2f1ae860b91b4a1b..f9f8794e50cb7e59bd015b9af15172e7c2f5f0d5 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -40,7 +40,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.2-rc' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1226      );
+define ( 'DB_UPDATE_VERSION',      1227      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -457,6 +457,13 @@ if (!defined("SIGTERM")) {
        define("SIGTERM", 15);
 }
 
+/**
+ * Depending on the PHP version this constant does exist - or not.
+ * See here: http://php.net/manual/en/curl.constants.php#117928
+ */
+if (!defined('CURLE_OPERATION_TIMEDOUT')) {
+        define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
+}
 /**
  *
  * Reverse the effect of magic_quotes_gpc if it is enabled.

diff --git a/database.sql b/database.sql
index 2b40552eb7aee79ba1ffd6312da9a3c6c5036874..4a5946ef38dc747b8c210e7f4f5b84ea60e046a4 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5.2-rc (Asparagus)
--- DB_UPDATE_VERSION 1226
+-- DB_UPDATE_VERSION 1227
 -- ------------------------------------------
 
 
@@ -1115,6 +1115,7 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
        `pid` int(11) NOT NULL DEFAULT 0,
        `executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`),
+        INDEX `pid` (`pid`),
         INDEX `priority_created` (`priority`,`created`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 441e7be7f7a66098d8a3d7240087b01d574d24a2..1daf042d538d143e7b5925f1dbcfeaba3c88db1d 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1742,6 +1742,7 @@ function db_definition() {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
+                                       "pid" => array("pid"),
                                        "priority_created" => array("priority", "created"),
                                        )
                        );

diff --git a/update.php b/update.php
index 695ed39919bf67fe6b963bfff6c1d9160fec959d..7561a9af19546e0d388dd2750da1683fb22f088b 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1226);
+define('UPDATE_VERSION' , 1227);
 
 /**
  *