diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:29:18 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-09-05 00:29:18 -0700 |
| commit | b5f9427ca95a11d809f04c67d2a3446e3cb4df95 (patch) | |
| tree | a6c315a7d326a05d554c3dd59d635dd892305619 /ext/pdo_dblib | |
| parent | 54f6c8d6dfae3fa8e8353e7b9dc08dd5d7ee2c88 (diff) | |
| parent | cee363d6093abb25a3b0a0f448f8928c1f819294 (diff) | |
| download | php-git-b5f9427ca95a11d809f04c67d2a3446e3cb4df95.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Recognize TDS versions 7.3 and 7.4
Diffstat (limited to 'ext/pdo_dblib')
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index 0a55cc4ff7..23f59a6d9e 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -340,6 +340,12 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options) ,{"7.2",DBVERSION_72} ,{"8.0",DBVERSION_72} #endif +#ifdef DBVERSION_73 + ,{"7.3",DBVERSION_73} +#endif +#ifdef DBVERSION_74 + ,{"7.4",DBVERSION_74} +#endif ,{"10.0",DBVERSION_100} ,{"auto",0} /* Only works with FreeTDS. Other drivers will bork */ |