]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1'
authorAdam Baratz <adambaratz@php.net>
Tue, 13 Sep 2016 20:19:25 +0000 (16:19 -0400)
committerAdam Baratz <adambaratz@php.net>
Tue, 13 Sep 2016 20:19:25 +0000 (16:19 -0400)
commit033018890db0c7c208833028bb89e88bbcb8229f
tree24f0046fe0f4a0282a58f2cca181a5f600d1db66
parent539463395c7af79f5a9229699567c0fcd1ccb0d7
parent421f654874b8ae1d765be1a5c177c13cb4b3cfc7
Merge branch 'PHP-7.1'

* PHP-7.1:
  Allow \PDO::setAttribute() to set pdo_dblib query timeouts