diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-01-06 07:59:48 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-01-06 07:59:48 +0100 |
| commit | 992a07a7e8d49c49313bf21cf0fc2f508ece9fc7 (patch) | |
| tree | e2e51fe318b9dbd6ba857dc435e685b624aeb25c /php-upstream.patch | |
| parent | 3be546796a6785af1deb2b210fffaed24c5aa2ea (diff) | |
PHP 5.6.30RC1
Diffstat (limited to 'php-upstream.patch')
| -rw-r--r-- | php-upstream.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..790f457 --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,21 @@ +From db890956ecc11c090716a536b00a07f2499fa73a 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 + +--- + ext/standard/tests/serialize/bug72610_3.phpt | 2 ++ + 1 file changed, 2 insertions(+) + +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 + |