The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions
This commit is contained in:
parent
ec5a3c3440
commit
945d3cc048
4 changed files with 12 additions and 3 deletions
9
boot.php
9
boot.php
|
@ -40,7 +40,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_CODENAME', 'Asparagus');
|
define ( 'FRIENDICA_CODENAME', 'Asparagus');
|
||||||
define ( 'FRIENDICA_VERSION', '3.5.2-rc' );
|
define ( 'FRIENDICA_VERSION', '3.5.2-rc' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1226 );
|
define ( 'DB_UPDATE_VERSION', 1227 );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Constant with a HTML line break.
|
* @brief Constant with a HTML line break.
|
||||||
|
@ -457,6 +457,13 @@ if (!defined("SIGTERM")) {
|
||||||
define("SIGTERM", 15);
|
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.
|
* Reverse the effect of magic_quotes_gpc if it is enabled.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
-- ------------------------------------------
|
-- ------------------------------------------
|
||||||
-- Friendica 3.5.2-rc (Asparagus)
|
-- 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,
|
`pid` int(11) NOT NULL DEFAULT 0,
|
||||||
`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
|
`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
|
||||||
PRIMARY KEY(`id`),
|
PRIMARY KEY(`id`),
|
||||||
|
INDEX `pid` (`pid`),
|
||||||
INDEX `priority_created` (`priority`,`created`)
|
INDEX `priority_created` (`priority`,`created`)
|
||||||
) DEFAULT COLLATE utf8mb4_general_ci;
|
) DEFAULT COLLATE utf8mb4_general_ci;
|
||||||
|
|
||||||
|
|
|
@ -1742,6 +1742,7 @@ function db_definition() {
|
||||||
),
|
),
|
||||||
"indexes" => array(
|
"indexes" => array(
|
||||||
"PRIMARY" => array("id"),
|
"PRIMARY" => array("id"),
|
||||||
|
"pid" => array("pid"),
|
||||||
"priority_created" => array("priority", "created"),
|
"priority_created" => array("priority", "created"),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
define('UPDATE_VERSION' , 1226);
|
define('UPDATE_VERSION' , 1227);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue