]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bf8f29 04c9271)
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Tue, 31 Mar 2015 22:59:21 +0000 (01:59 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Tue, 31 Mar 2015 22:59:21 +0000 (01:59 +0300)
* PHP-5.6:
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)

Conflicts:
ext/ereg/regex/regcomp.c


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