]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 28 Apr 2015 06:22:44 +0000 (23:22 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 28 Apr 2015 06:25:32 +0000 (23:25 -0700)
commit13c32a102c7626673f41dfecba4188a6c6c6934c
tree69b9e5d3fbeb6780824c3de19d300b8a608de06c
parent957aa220aa175a874f429f97701eede0f1ef14d3
parent23917b451bf4029e78082b4e0a56bc4c6f117990
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Upgrade PCRE to 8.36, it fixes some crashes
31 files changed:
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/pcre_exec.c
ext/pcre/pcrelib/testdata/greppatN4
ext/pcre/pcrelib/testdata/saved16BE-1
ext/pcre/pcrelib/testdata/saved16LE-1
ext/pcre/pcrelib/testdata/saved32BE-1
ext/pcre/pcrelib/testdata/saved32LE-1
ext/pcre/pcrelib/testdata/testinput11
ext/pcre/pcrelib/testdata/testinput16
ext/pcre/pcrelib/testdata/testinput18
ext/pcre/pcrelib/testdata/testinput19
ext/pcre/pcrelib/testdata/testinput25
ext/pcre/pcrelib/testdata/testoutput11-16
ext/pcre/pcrelib/testdata/testoutput11-32
ext/pcre/pcrelib/testdata/testoutput11-8
ext/pcre/pcrelib/testdata/testoutput12
ext/pcre/pcrelib/testdata/testoutput13
ext/pcre/pcrelib/testdata/testoutput14
ext/pcre/pcrelib/testdata/testoutput15
ext/pcre/pcrelib/testdata/testoutput16
ext/pcre/pcrelib/testdata/testoutput17
ext/pcre/pcrelib/testdata/testoutput18-16
ext/pcre/pcrelib/testdata/testoutput18-32
ext/pcre/pcrelib/testdata/testoutput19
ext/pcre/pcrelib/testdata/testoutput21-16
ext/pcre/pcrelib/testdata/testoutput21-32
ext/pcre/pcrelib/testdata/testoutput22-16
ext/pcre/pcrelib/testdata/testoutput22-32
ext/pcre/pcrelib/testdata/testoutput23
ext/pcre/pcrelib/testdata/testoutput25
ext/pcre/pcrelib/testdata/wintestoutput3