]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe894c2 12d76b8)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 4 Aug 2014 07:15:38 +0000 (00:15 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 4 Aug 2014 07:15:38 +0000 (00:15 -0700)
* PHP-5.6:
  Fix bug #67705 (extensive backtracking in rule regular expression)
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)


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