]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 28 Apr 2015 06:30:57 +0000 (23:30 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 28 Apr 2015 06:30:57 +0000 (23:30 -0700)
commit19ad1389aaf0d964de918857164a6ef45f444158
tree6cecd2a79d199e340c8f9048d9f1a2e8413385bc
parent1e18ffd2f8011d23f7a48774428f5108f823a3ac
parent13c32a102c7626673f41dfecba4188a6c6c6934c
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Upgrade PCRE to 8.36, it fixes some crashes
ext/pcre/pcrelib/ChangeLog
ext/pcre/pcrelib/README
ext/pcre/pcrelib/doc/pcre.txt
ext/pcre/pcrelib/pcre_exec.c
ext/pcre/pcrelib/pcre_study.c