]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorThomas Punt <tpunt@php.net>
Sun, 29 Apr 2018 16:38:12 +0000 (17:38 +0100)
committerThomas Punt <tpunt@php.net>
Sun, 29 Apr 2018 16:38:12 +0000 (17:38 +0100)
* PHP-7.1:
  The SO_PASSCRED constant is conditionally defined


Trivial merge