com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_dbl ib/dblib_driver.c

From: Date: Mon, 05 Sep 2016 07:29:18 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_dbl ib/dblib_driver.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94303@lists.php.net to get a copy of this message
Commit: b5f9427ca95a11d809f04c67d2a3446e3cb4df95 Author: Stanislav Malyshev <stas@php.net> Mon, 5 Sep 2016 00:29:18 -0700 Parents: 54f6c8d6dfae3fa8e8353e7b9dc08dd5d7ee2c88 cee363d6093abb25a3b0a0f448f8928c1f819294 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=b5f9427ca95a11d809f04c67d2a3446e3cb4df95 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Recognize TDS versions 7.3 and 7.4 Changed paths: MM ext/pdo_dblib/dblib_driver.c Diff: diff --cc ext/pdo_dblib/dblib_driver.c index 0a55cc4,b5744a4..23f59a6 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@@ -340,9 -281,15 +340,15 @@@ static int pdo_dblib_handle_factory(pdo ,{"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 */ - + }; struct pdo_data_src_parser vars[] = {

« previous php.cvs (#94303) next »