From: Anatol Belski <ab@php.net>
Date: Fri, 22 May 2015 19:32:40 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d7003f708cb2883f1fb1cabe6f44cfdaa2c03f5;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test
  Add entry for bug #69354, fixed in 5.5.25
  Add CVE for bugs in 5.6.9
  Add entry about PCRE upgrade (rev 95fa7279)
  Add CVE for bugs in 5.5.25

Conflicts:
	ext/phar/tests/bug69441.phpt
---

8d7003f708cb2883f1fb1cabe6f44cfdaa2c03f5
diff --cc ext/phar/tests/bug69441.phpt
index 3e995e03c0,934c5f6b73..3536c3a835
--- a/ext/phar/tests/bug69441.phpt
+++ b/ext/phar/tests/bug69441.phpt
@@@ -14,7 -14,7 +14,7 @@@ $r = new Phar($fname, 0)
  
  ==DONE==
  --EXPECTF--
- UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%s%ebug69441.phar" in %s%ebug69441.php:%d
 -exception 'UnexpectedValueException' with message 'phar error: corrupted central directory entry, no magic signature in zip-based phar "%sbug69441.phar"' in %sbug69441.php:%d
++UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%sbug69441.phar" in %sbug69441.php:%d
  Stack trace:
  #0 %s%ebug69441.php(%d): Phar->__construct('%s', 0)
  #1 {main}