diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-08-04 00:12:43 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-08-04 00:12:43 -0700 |
| commit | 12d76b8cce732564b806e928325c33ab050307bd (patch) | |
| tree | 7623c775d2aee8322c95640433a73a28f82752b9 | |
| parent | 28786a2f82addf7035a4871157f0b63492ac608b (diff) | |
| parent | 9b9aa4b81178af7ff7c516834617d9c609b29325 (diff) | |
| download | php-git-12d76b8cce732564b806e928325c33ab050307bd.tar.gz | |
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
0 files changed, 0 insertions, 0 deletions