Browse Source

The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions

pull/3517/head
Michael 4 years ago
parent
commit
945d3cc048
4 changed files with 12 additions and 3 deletions
  1. +8
    -1
      boot.php
  2. +2
    -1
      database.sql
  3. +1
    -0
      include/dbstructure.php
  4. +1
    -1
      update.php

+ 8
- 1
boot.php View File

@ -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.


+ 2
- 1
database.sql View File

@ -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;

+ 1
- 0
include/dbstructure.php View File

@ -1742,6 +1742,7 @@ function db_definition() {
),
"indexes" => array(
"PRIMARY" => array("id"),
"pid" => array("pid"),
"priority_created" => array("priority", "created"),
)
);


+ 1
- 1
update.php View File

@ -1,6 +1,6 @@
<?php
define('UPDATE_VERSION' , 1226);
define('UPDATE_VERSION' , 1227);
/**
*


Loading…
Cancel
Save