From: Adam Baratz <adambaratz@php.net>
Date: Tue, 13 Sep 2016 20:19:25 +0000 (-0400)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=033018890db0c7c208833028bb89e88bbcb8229f;p=php

Merge branch 'PHP-7.1'

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

033018890db0c7c208833028bb89e88bbcb8229f