]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7251a8 8a065c5)
Merge branch 'ZendEngine3'
authorAndrea Faulds <ajf@ajf.me>
Fri, 5 Dec 2014 19:47:27 +0000 (19:47 +0000)
committerAndrea Faulds <ajf@ajf.me>
Fri, 5 Dec 2014 19:47:27 +0000 (19:47 +0000)
* ZendEngine3:
  Restored zip/oci8 PHP 4 code, add PHP 7 checks
  Note macro removal in UPGRADING.INTERNALS
  Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
  Zend Engine 3


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