]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 12 Jul 2017 12:49:58 +0000 (14:49 +0200)
committerAnatol Belski <ab@php.net>
Wed, 12 Jul 2017 12:49:58 +0000 (14:49 +0200)
commit8b04e89ef0100932a451870b84666a36fa2fa43f
treebbcb2ff0b9dc84b278b5901547fd2f734875ad5f
parent82acb58d8a1d2d4bf3833797833f2d3dff720e2c
parent04cc2f6473e8439929ba8448f038058d5e20ba86
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  increase poll timeout as false positives mitigation