diff options
Diffstat (limited to 'php-upstream.patch')
| -rw-r--r-- | php-upstream.patch | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/php-upstream.patch b/php-upstream.patch index 790f457..16f00e6 100644 --- a/php-upstream.patch +++ b/php-upstream.patch @@ -1,21 +1,24 @@ -From db890956ecc11c090716a536b00a07f2499fa73a Mon Sep 17 00:00:00 2001 +From fb935fdaca0b1b65248c69315b1c21bd6857988c Mon Sep 17 00:00:00 2001 From: Remi Collet <remi@php.net> -Date: Fri, 6 Jan 2017 06:23:59 +0100 -Subject: [PATCH] add skip when json not loaded +Date: Thu, 19 Jan 2017 07:37:28 +0100 +Subject: [PATCH] fix test for 32bits (int -> float) --- - ext/standard/tests/serialize/bug72610_3.phpt | 2 ++ - 1 file changed, 2 insertions(+) + ext/standard/tests/serialize/bug72731.phpt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/ext/standard/tests/serialize/bug72610_3.phpt b/ext/standard/tests/serialize/bug72610_3.phpt -index 4e69087..86941f2 100644 ---- a/ext/standard/tests/serialize/bug72610_3.phpt -+++ b/ext/standard/tests/serialize/bug72610_3.phpt -@@ -1,5 +1,7 @@ - --TEST-- - __wakeup should be able to modify dynamic properties without affecting copies of those properties -+--SKIPIF-- -+<?php if (!extension_loaded("json")) print "skip json_encode needed"; ?> - --FILE-- - <?php +diff --git a/ext/standard/tests/serialize/bug72731.phpt b/ext/standard/tests/serialize/bug72731.phpt +index 3d7d1e7..020fb32 100644 +--- a/ext/standard/tests/serialize/bug72731.phpt ++++ b/ext/standard/tests/serialize/bug72731.phpt +@@ -14,5 +14,5 @@ $poc = 'O:8:"stdClass":1:{i:0;O:3:"obj":1:{s:4:"ryat";R:1;}}'; + var_dump(unserialize($poc)); + ?> +---EXPECT-- +-int(73588229205) ++--EXPECTF-- ++%s(73588229205) +-- +2.9.3 + |