]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 4 Aug 2014 07:12:43 +0000 (00:12 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 4 Aug 2014 07:12:43 +0000 (00:12 -0700)
commit12d76b8cce732564b806e928325c33ab050307bd
tree7623c775d2aee8322c95640433a73a28f82752b9
parent28786a2f82addf7035a4871157f0b63492ac608b
parent9b9aa4b81178af7ff7c516834617d9c609b29325
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)

Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch