]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8db64e9 51d1989)
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Fri, 8 Jul 2016 14:31:53 +0000 (16:31 +0200)
committerJulien Pauli <jpauli@php.net>
Fri, 8 Jul 2016 14:31:53 +0000 (16:31 +0200)
* PHP-5.6:
  Updated NEWS
  update filter_var filters for ipv4 addresses to reflect rfc6890

1  2 
ext/filter/logical_filters.c patch | diff1 | diff2 | blob | history

diff --cc ext/filter/logical_filters.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.