]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/826'
authorJulien Pauli <jpauli@php.net>
Thu, 27 Nov 2014 10:22:23 +0000 (11:22 +0100)
committerJulien Pauli <jpauli@php.net>
Thu, 27 Nov 2014 10:22:23 +0000 (11:22 +0100)
* pull-request/826:
  New label length test
  Fix ext/filter/tests/033.phpt
  Fix filter_list test
  FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL

1  2 
ext/filter/filter.c

Simple merge