diff options
| author | Remi Collet <remi@php.net> | 2017-07-04 20:26:53 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-07-04 20:26:53 +0200 |
| commit | 1fa8e74d6eebaa19174ea56581f23b13e6b77000 (patch) | |
| tree | c8ecd40f5ae3e64db1754c60dfe96cbdbfd010d4 /ext/standard | |
| parent | 41ba98f02d6ce4c7572ef2b7856defead7d232ac (diff) | |
| parent | 4b38feabe745b553703cd53f37615b955502f4e7 (diff) | |
| download | php-git-1fa8e74d6eebaa19174ea56581f23b13e6b77000.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Adapt for 32-bits which fails at different offset (49 vs 38)
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/tests/serialize/bug74614.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/serialize/bug74614.phpt b/ext/standard/tests/serialize/bug74614.phpt index ae962628e9..794c8714d3 100644 --- a/ext/standard/tests/serialize/bug74614.phpt +++ b/ext/standard/tests/serialize/bug74614.phpt @@ -7,4 +7,4 @@ unserialize('a:3020000000000000000000000000000001:{i:0;a:0:{}i:1;i:2;i:2;i:3;i:3 ?> --EXPECTF-- -Notice: unserialize(): Error at offset 38 of 113 bytes in %s on line %d +Notice: unserialize(): Error at offset %d of 113 bytes in %s on line %d |