webbuilder_pel7ppc64lebuilder0
2 months ago
2 changed files with 190 additions and 0 deletions
@ -0,0 +1,98 @@ |
|||||||
|
diff -up ./ext/date/tests/bug33414-2.phpt.datetests ./ext/date/tests/bug33414-2.phpt |
||||||
|
--- ./ext/date/tests/bug33414-2.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/date/tests/bug33414-2.phpt 2020-04-09 14:40:00.809433489 +0200 |
||||||
|
@@ -74,10 +74,10 @@ $strtotime_tstamp = strtotime("next Frid |
||||||
|
print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; |
||||||
|
print "wanted=Friday 00:00:00\n\n"; |
||||||
|
?> |
||||||
|
---EXPECT-- |
||||||
|
+--EXPECTF-- |
||||||
|
TZ=Pacific/Rarotonga - wrong day. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -1030 0 |
||||||
|
-result=Tuesday 1970-01-06 00:00:00 -1030 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Tuesday 1970-01-06 00:00:00 %s |
||||||
|
wanted=Tuesday 00:00:00 |
||||||
|
|
||||||
|
TZ=Atlantic/South_Georgia - wrong day. |
||||||
|
@@ -91,13 +91,13 @@ result=Monday 2005-04-04 00:00:00 EDT 1 |
||||||
|
wanted=Monday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Enderbury - wrong day, off by 2 days. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -12 0 |
||||||
|
-result=Monday 1970-01-05 00:00:00 -12 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Monday 1970-01-05 00:00:00 %s |
||||||
|
wanted=Monday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Kiritimati - wrong day, off by 2 days. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -1040 0 |
||||||
|
-result=Monday 1970-01-05 00:00:00 -1040 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Monday 1970-01-05 00:00:00 %s |
||||||
|
wanted=Monday 00:00:00 |
||||||
|
|
||||||
|
TZ=America/Managua - wrong day. |
||||||
|
@@ -106,13 +106,13 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1 |
||||||
|
wanted=Tuesday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Pitcairn - wrong day. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -0830 0 |
||||||
|
-result=Wednesday 1970-01-07 00:00:00 -0830 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Wednesday 1970-01-07 00:00:00 %s |
||||||
|
wanted=Wednesday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Fakaofo - wrong day. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -11 0 |
||||||
|
-result=Saturday 1970-01-03 00:00:00 -11 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Saturday 1970-01-03 00:00:00 %s |
||||||
|
wanted=Saturday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Johnston - wrong day. |
||||||
|
diff -up ./ext/date/tests/bug66985.phpt.datetests ./ext/date/tests/bug66985.phpt |
||||||
|
--- ./ext/date/tests/bug66985.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/date/tests/bug66985.phpt 2020-04-09 14:40:37.099288185 +0200 |
||||||
|
@@ -3,7 +3,7 @@ Bug #66985 (Some timezones are no longer |
||||||
|
--FILE-- |
||||||
|
<?php |
||||||
|
$zones = array( |
||||||
|
- "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "Factory", "GB-Eire", |
||||||
|
+ "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "GB-Eire", |
||||||
|
"GMT0", "Greenwich", "Hongkong", "Iceland", "Iran", "Israel", "Jamaica", |
||||||
|
"Japan", "Kwajalein", "Libya", "MST7MDT", "Navajo", "NZ-CHAT", "Poland", |
||||||
|
"Portugal", "PST8PDT", "Singapore", "Turkey", "Universal", "W-SU", |
||||||
|
@@ -45,11 +45,6 @@ DateTimeZone Object |
||||||
|
) |
||||||
|
DateTimeZone Object |
||||||
|
( |
||||||
|
- [timezone_type] => 3 |
||||||
|
- [timezone] => Factory |
||||||
|
-) |
||||||
|
-DateTimeZone Object |
||||||
|
-( |
||||||
|
[timezone_type] => 3 |
||||||
|
[timezone] => GB-Eire |
||||||
|
) |
||||||
|
diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strtotime3-64bit.phpt |
||||||
|
--- ./ext/date/tests/strtotime3-64bit.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/date/tests/strtotime3-64bit.phpt 2020-04-09 14:40:00.809433489 +0200 |
||||||
|
@@ -44,7 +44,7 @@ foreach ($strs as $str) { |
||||||
|
} |
||||||
|
|
||||||
|
?> |
||||||
|
---EXPECT-- |
||||||
|
+--EXPECTF-- |
||||||
|
bool(false) |
||||||
|
bool(false) |
||||||
|
string(31) "Thu, 15 Jun 2006 00:00:00 +0100" |
||||||
|
@@ -53,7 +53,7 @@ bool(false) |
||||||
|
string(31) "Fri, 16 Jun 2006 23:49:12 +0100" |
||||||
|
bool(false) |
||||||
|
string(31) "Fri, 16 Jun 2006 02:22:00 +0100" |
||||||
|
-string(31) "Sun, 16 Jun 0222 02:22:00 -0036" |
||||||
|
+string(31) "Sun, 16 Jun 0222 02:22:00 %s" |
||||||
|
string(31) "Fri, 16 Jun 2006 02:22:33 +0100" |
||||||
|
bool(false) |
||||||
|
string(31) "Tue, 02 Mar 2004 00:00:00 +0000" |
@ -0,0 +1,92 @@ |
|||||||
|
diff -up ./ext/dba/config.m4.libdb ./ext/dba/config.m4 |
||||||
|
--- ./ext/dba/config.m4.libdb 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/dba/config.m4 2020-04-09 14:35:08.208605065 +0200 |
||||||
|
@@ -375,61 +375,13 @@ if test "$PHP_DB4" != "no"; then |
||||||
|
dbdp4="/usr/local/BerkeleyDB.4." |
||||||
|
dbdp5="/usr/local/BerkeleyDB.5." |
||||||
|
for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do |
||||||
|
- if test -f "$i/db5/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/db5/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/db4/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/db4/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.3/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.3/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.1/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.1/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.0/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.0/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.8/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.8/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.7/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.7/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.6/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.6/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.5/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.5/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db/db4.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db/db4.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db.h"; then |
||||||
|
+ if test -f "$i/include/db.h"; then |
||||||
|
THIS_PREFIX=$i |
||||||
|
THIS_INCLUDE=$i/include/db.h |
||||||
|
break |
||||||
|
fi |
||||||
|
done |
||||||
|
- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||||
|
+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||||
|
fi |
||||||
|
PHP_DBA_STD_RESULT(db4,Berkeley DB4) |
||||||
|
|
||||||
|
diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c |
||||||
|
--- ./ext/dba/dba.c.libdb 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/dba/dba.c 2020-04-09 14:36:30.593275190 +0200 |
||||||
|
@@ -50,6 +50,10 @@ |
||||||
|
#include "php_lmdb.h" |
||||||
|
#include "dba_arginfo.h" |
||||||
|
|
||||||
|
+#ifdef DB4_INCLUDE_FILE |
||||||
|
+#include DB4_INCLUDE_FILE |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
PHP_MINIT_FUNCTION(dba); |
||||||
|
PHP_MSHUTDOWN_FUNCTION(dba); |
||||||
|
PHP_MINFO_FUNCTION(dba); |
||||||
|
@@ -459,6 +463,10 @@ PHP_MINFO_FUNCTION(dba) |
||||||
|
|
||||||
|
php_info_print_table_start(); |
||||||
|
php_info_print_table_row(2, "DBA support", "enabled"); |
||||||
|
+#ifdef DB_VERSION_STRING |
||||||
|
+ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING); |
||||||
|
+ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL)); |
||||||
|
+#endif |
||||||
|
if (handlers.s) { |
||||||
|
smart_str_0(&handlers); |
||||||
|
php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s)); |
Loading…
Reference in new issue