]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69613a7 0cbf3af)
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Fri, 6 Nov 2015 22:10:40 +0000 (23:10 +0100)
committerAnatol Belski <ab@php.net>
Fri, 6 Nov 2015 22:10:40 +0000 (23:10 +0100)
* PHP-7.0:
  update NEWS
  fix decrement_function regarding bug #70863
  Fixed bug #70863 Incorect logic to increment_function for proxy objects
  no more dev ZEND_VERSION
  Add support for IPV6_V6ONLY on sockets

Conflicts:
Zend/zend.h


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