]> granicus.if.org Git - php/commit
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)
commitfa42a513a4cf51837ebc974014d52c0182562b8a
tree60bb037c19963115183cdf628f2ab0749a419b82
parentfe894c2154e6b013f0d0b29ca660ad719fd1affe
parent12d76b8cce732564b806e928325c33ab050307bd
Merge branch 'PHP-5.6'

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