]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 50688e3 0bc3a74)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 22 May 2015 19:32:40 +0000 (21:32 +0200)
committerAnatol Belski <ab@php.net>
Fri, 22 May 2015 19:32:40 +0000 (21:32 +0200)
commit8d7003f708cb2883f1fb1cabe6f44cfdaa2c03f5
tree3e16e6fd3aa713466546375a749e203db23eaf48tree | snapshot
parent50688e3984054d74f0a320078bdc64fef8f949f5commit | diff
parent0bc3a74334473c2371b7a9bb427783588290baddcommit | diff
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
ext/phar/tests/bug69441.phpt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.