diff options
Diffstat (limited to 'php-upstream.patch')
| -rw-r--r-- | php-upstream.patch | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index a36a4f9..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,131 +0,0 @@ -From d11211fb5379324e99dc67cdd7a0ec5031874ae7 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 29 Mar 2017 07:01:14 +0200 -Subject: [PATCH] relax test failing in fast computer - ---- - ext/date/tests/bug73837.phpt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/ext/date/tests/bug73837.phpt b/ext/date/tests/bug73837.phpt -index 220deb6..af47cfd 100644 ---- a/ext/date/tests/bug73837.phpt -+++ b/ext/date/tests/bug73837.phpt -@@ -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 > 900 ) ? "microseconds differ\n" : "microseconds do not differ enough\n"; - ?> ----EXPECT-- -+--EXPECTF-- -+int(%d) - microseconds differ --- -2.1.4 - -From 012dc336a6ae01208c394994b648c221337bf81d Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 29 Mar 2017 07:25:01 +0200 -Subject: [PATCH] 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...) ---- - ext/pdo_sqlite/pdo_sqlite.c | 2 ++ - ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt | 5 ++++- - ext/sqlite3/sqlite3.c | 2 ++ - ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt | 5 ++++- - 4 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c -index 621123b..d0eb182 100644 ---- a/ext/pdo_sqlite/pdo_sqlite.c -+++ b/ext/pdo_sqlite/pdo_sqlite.c -@@ -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); - } -diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt -index 4f0b675..d826d93 100644 ---- a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt -+++ b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt -@@ -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 - -diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c -index 5a796e1..f1ed93b 100644 ---- a/ext/sqlite3/sqlite3.c -+++ b/ext/sqlite3/sqlite3.c -@@ -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; - } -diff --git a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt -index 31fd42b..f9f0b5f 100644 ---- a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt -+++ b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt -@@ -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.1.4 - -From cec720857a21873864badc53c10d660b673e38cc Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 29 Mar 2017 07:38:40 +0200 -Subject: [PATCH] relax more this test - ---- - ext/date/tests/bug73837.phpt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/date/tests/bug73837.phpt b/ext/date/tests/bug73837.phpt -index af47cfd..6fd12f8 100644 ---- a/ext/date/tests/bug73837.phpt -+++ b/ext/date/tests/bug73837.phpt -@@ -12,7 +12,7 @@ for ( $i = 0; $i < 1000; $i++ ) - } - - var_dump($n = count( $collect )); --echo ( $n > 900 ) ? "microseconds differ\n" : "microseconds do not differ enough\n"; -+echo ( $n > 800 ) ? "microseconds differ\n" : "microseconds do not differ enough ($n)\n"; - ?> - --EXPECTF-- - int(%d) --- -2.1.4 - |