diff options
| author | Anatol Belski <ab@php.net> | 2014-12-05 07:08:35 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-05 07:08:35 +0100 |
| commit | 6cf5ac7567d996020819a22585597ab10de4a805 (patch) | |
| tree | e4626094c7968f3f05fd2a629f11c0112eed5d6f | |
| parent | 9c5d84ace1daaf2dcd08c04b9c138940afdf5001 (diff) | |
| parent | c65143d571b46d52b82807c0c214c4cc6af9e0fb (diff) | |
| download | php-git-6cf5ac7567d996020819a22585597ab10de4a805.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separators in test
| -rw-r--r-- | ext/standard/tests/serialize/bug68044.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/tests/serialize/bug68044.phpt b/ext/standard/tests/serialize/bug68044.phpt index 031e44e149..f8ef937b1e 100644 --- a/ext/standard/tests/serialize/bug68044.phpt +++ b/ext/standard/tests/serialize/bug68044.phpt @@ -6,7 +6,7 @@ Bug #68044 Integer overflow in unserialize() (32-bits only) ?> ===DONE== --EXPECTF-- -Warning: Insufficient data for unserializing - %d required, 1 present in %s/bug68044.php on line 2 +Warning: Insufficient data for unserializing - %d required, 1 present in %s%ebug68044.php on line 2 -Notice: unserialize(): Error at offset 32 of 33 bytes in %s/bug68044.php on line 2 +Notice: unserialize(): Error at offset 32 of 33 bytes in %s%ebug68044.php on line 2 ===DONE== |