From 5786f866566bac863b8d4a5477100c00cd47d301 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 23 Aug 2015 13:03:26 +0200
Subject: [PATCH 1/4] fix test

backported from master
---
 ext/standard/tests/strings/bug65769.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/standard/tests/strings/bug65769.phpt b/ext/standard/tests/strings/bug65769.phpt
index 15dad45bd5e..f34936078ba 100644
--- a/ext/standard/tests/strings/bug65769.phpt
+++ b/ext/standard/tests/strings/bug65769.phpt
@@ -73,7 +73,7 @@ string(19) "Serbian_Serbia.1250"
 string(1) ","
 string(1) "."
 string(3) "RSD"
-string(4) "din."
+string(4) "RSD"
 string(1) ","
 string(1) "."
 ++++++++++++++++++++++

From 24e78ec1d830b7dac15ad53bd0a1079a3dbaf5dd Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 23 Aug 2015 13:04:36 +0200
Subject: [PATCH 2/4] fix test

---
 ext/standard/tests/file/tempnam_variation3-win32.phpt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt
index cc8194afa3a..a2816b2caa1 100644
--- a/ext/standard/tests/file/tempnam_variation3-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt
@@ -102,7 +102,10 @@ OK
 Failed, not created in the correct directory %s vs %s
 0
 -- Iteration 6 --
-OK
+
+Warning: tempnam() expects parameter 2 to be a valid path, string given in %stempnam_variation3-win32.php on line %d
+Failed, not created in the correct directory %s vs %stempnamVar3
+0
 -- Iteration 7 --
 
 Warning: tempnam() expects parameter 2 to be a valid path, array given in %s\ext\standard\tests\file\tempnam_variation3-win32.php on line %d

From b460b530d633faf0aa6db9650dd15446dadea3db Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 23 Aug 2015 13:06:00 +0200
Subject: [PATCH 3/4] fix test

backport from master
---
 ext/pdo_pgsql/tests/getnotify.phpt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/pdo_pgsql/tests/getnotify.phpt b/ext/pdo_pgsql/tests/getnotify.phpt
index c093e0357a5..c54a31604d7 100644
--- a/ext/pdo_pgsql/tests/getnotify.phpt
+++ b/ext/pdo_pgsql/tests/getnotify.phpt
@@ -70,14 +70,16 @@ var_dump($db->pgsqlGetNotify());
 // Test second parameter, should wait 2 seconds because no notify is queued
 $t = microtime(1);
 $notify = $db->pgsqlGetNotify(PDO::FETCH_ASSOC, 1000);
-var_dump((microtime(1) - $t) >= 1);
+$diff = microtime(1) - $t;
+var_dump($diff >= 1 || 1 - abs($diff) < .01);
 var_dump($notify);
 
 // Test second parameter, should return immediately because a notify is queued
 $db->exec("NOTIFY notifies_phpt");
 $t = microtime(1);
 $notify = $db->pgsqlGetNotify(PDO::FETCH_ASSOC, 5000);
-var_dump((microtime(1) - $t) < 1);
+$diff = microtime(1) - $t;
+var_dump($diff < 1 || abs(1 - abs($diff)) < .01);
 var_dump(count($notify));
 
 ?>

From 78b2b1d6f74705d7835bf34297c2c6c78b2d0601 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 23 Aug 2015 13:06:51 +0200
Subject: [PATCH 4/4] fix test

backport from master
---
 ext/openssl/tests/bug65698.phpt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/openssl/tests/bug65698.phpt b/ext/openssl/tests/bug65698.phpt
index 35d31764d5d..5b693421fe5 100644
--- a/ext/openssl/tests/bug65698.phpt
+++ b/ext/openssl/tests/bug65698.phpt
@@ -13,7 +13,7 @@ var_dump($info["validFrom"], $info["validFrom_time_t"], $info["validTo"], $info[
 Done
 --EXPECTF--
 string(15) "20090303125318Z"
-int(1236084798)
+int(12360%d)
 string(15) "20240303125318Z"
-int(1709470398)
+int(17094%d)
 Done