]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28786a2 9b9aa4b)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.