Compare commits

...
5 Commits
Author SHA1 Message Date
Joe Watkins 1f68c9d764 set versions 2017-04-11 16:34:07 +01:00
Remi Collet a99cddf1c6 Fix buid with system libsqlite, see bug #74217
SQLITE_DETERMINISTIC only exists in recent version
e.g. missing on 3.7 which is the default on RHEL/CentOS-7
and probably others (wheezy have 3.7, jessie 3.8...)
2017-03-29 07:54:44 +01:00
Remi Collet 99d2cd0a32 relax more this test 2017-03-29 07:54:35 +01:00
Remi Collet f6a7f18597 relax test failing in fast computer 2017-03-29 07:54:32 +01:00
Joe Watkins 7335437a83 set versions 2017-03-28 15:24:25 +01:00
8 changed files with 20 additions and 8 deletions

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2017, PHP 7.1.4
13 Apr 2017, PHP 7.1.4
- Core:
. Fixed bug #74149 (static embed SAPI linkage error). (krakjoe)
+1 -1
View File
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=1
PHP_RELEASE_VERSION=4
PHP_EXTRA_VERSION="-dev"
PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
+4 -2
View File
@@ -11,7 +11,9 @@ for ( $i = 0; $i < 1000; $i++ )
$collect[$key] = true;
}
echo ( count( $collect ) > 990 ) ? "microseconds differ\n" : "microseconds do not differ enough\n";
var_dump($n = count( $collect ));
echo ( $n > 800 ) ? "microseconds differ\n" : "microseconds do not differ enough ($n)\n";
?>
--EXPECT--
--EXPECTF--
int(%d)
microseconds differ
+2
View File
@@ -69,7 +69,9 @@ ZEND_GET_MODULE(pdo_sqlite)
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(pdo_sqlite)
{
#ifdef SQLITE_DETERMINISTIC
REGISTER_PDO_CLASS_CONST_LONG("SQLITE_DETERMINISTIC", (zend_long)SQLITE_DETERMINISTIC);
#endif
return php_pdo_register_driver(&pdo_sqlite_driver);
}
@@ -1,7 +1,10 @@
--TEST--
PDO_sqlite: Testing sqliteCreateFunction() with flags
--SKIPIF--
<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?>
<?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
if (!defined('PDO::SQLITE_DETERMINISTIC')) die('skip system sqlite is to old');
?>
--FILE--
<?php
+2
View File
@@ -2283,7 +2283,9 @@ PHP_MINIT_FUNCTION(sqlite3)
REGISTER_LONG_CONSTANT("SQLITE3_OPEN_READWRITE", SQLITE_OPEN_READWRITE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLITE3_OPEN_CREATE", SQLITE_OPEN_CREATE, CONST_CS | CONST_PERSISTENT);
#ifdef SQLITE_DETERMINISTIC
REGISTER_LONG_CONSTANT("SQLITE3_DETERMINISTIC", SQLITE_DETERMINISTIC, CONST_CS | CONST_PERSISTENT);
#endif
return SUCCESS;
}
@@ -1,7 +1,10 @@
--TEST--
SQLite3::createFunction - Test with flags
--SKIPIF--
<?php require_once(__DIR__ . '/skipif.inc'); ?>
<?php
require_once(__DIR__ . '/skipif.inc');
if (!defined('SQLITE3_DETERMINISTIC')) die('skip system sqlite is to old');
?>
--FILE--
<?php
+2 -2
View File
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 1
#define PHP_RELEASE_VERSION 4
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "7.1.4-dev"
#define PHP_EXTRA_VERSION ""
#define PHP_VERSION "7.1.4"
#define PHP_VERSION_ID 70104