]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:56:48 +0000 (07:56 +0100)
committerRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:56:48 +0000 (07:56 +0100)
* PHP-5.5:
  NEWS
  Fix bug #68463 listen.allowed_clients can silently result in no allowed access
  Raise a warning when listen = hostname used and is resolved as multiple addresses


Trivial merge