Commit graph

69 commits

Author SHA1 Message Date
Jenny Tam 79ee775b81 Updated versions to 5.1.0-preview 2017-09-13 15:34:06 -07:00
Jenny Tam 58f2068479 conflicts in msodbcsql 2017-09-01 16:10:44 -07:00
Jenny Tam 15247faae0 Added support for loading a custom keystore provider for Column Encryption 2017-09-01 16:10:42 -07:00
v-kaywon f744b7e515 merge ae code 2017-09-01 16:10:40 -07:00
David Puglielli c1e7280dc6 Version updated 2017-07-20 11:44:46 -07:00
v-kaywon f2510c7d5d Merge pull request #461 from v-kaywon/moreSAL
add more annotations
2017-06-30 16:35:29 -07:00
ulvii 58e8a24b17 Fixing issues reported by binary analysis - Hardening checks (#460)
* Adding compiler and linker options for hardening check

* Update config.m4

* Adding fstack protector to compiler options

* Detect platform in config.m4

* Removing the newly added linker flag, because its breaking the PDO_SQLSRV load. Creating a backlog item

* Update config.m4

* Update config.m4

* Testing with -O3

* Adding optimization flag to windows config files

* Update config.w32
2017-06-30 16:28:04 -07:00
v-kaywon f5f5d5e82f add more annotations 2017-06-30 15:17:14 -07:00
v-kaywon b78bcf8be3 fix GetVersionExA is Deprecated warning 2017-06-29 12:23:46 -07:00
v-kaywon fb64892e37 fix inconsistent annotation in get_error_message in util.cpp 2017-06-29 11:53:04 -07:00
v-kaywon f0da33db26 change _In_ to _Inout_ annotation for pdo_dbh and pdo_stmt objects 2017-06-27 15:17:21 -07:00
v-kaywon bde81001e9 added SAL annotations and fixed warnings 2017-06-22 14:04:34 -07:00
Hadis Kakanejadi Fard a879e40162 updated version to 4.3 rc 2017-06-20 10:12:23 -07:00
v-kaywon a97a2f5880 Merge pull request #443 from v-kaywon/fix_leak
Fix leak in connection and statement resource in SQLSRV driver
2017-06-19 17:29:28 -07:00
v-kaywon 84ee58cb5f Merge pull request #426 from v-kaywon/tnir
Add TNIR conn option and tests
2017-06-19 17:27:39 -07:00
v-kaywon c508a84ef1 changed structure of UTF8 data; added comment for fix in source code 2017-06-19 12:55:40 -07:00
v-kaywon c408f8c294 fix leak in SQLSRV driver: prevent leak in zval containing the connection and statement resource 2017-06-16 15:43:15 -07:00
susanh fe2a14c798 Merge branch 'macconfig' of https://github.com/lilgreenbird/msphpsql into macconfig 2017-06-16 13:00:20 -07:00
susanh e7f621e4f9 remove comment about workaround 2017-06-16 12:49:05 -07:00
susanh f4ae5e1e4c added MACOSX_DEPLOYMENT_TARGET to not use linker flat_namespace flag 2017-06-15 17:46:04 -07:00
v-kaywon 208cc4a078 Add TNIR conn option and tests 2017-06-07 13:53:04 -07:00
Hadis Kakanejadi Fard e0a65cd0a5 reverted m4 files 2017-05-24 12:45:42 -07:00
Hadis Kakanejadi Fard 7ffa4d470a added the header to m4 and updated SQLSRV headers to 4.2 2017-05-24 10:09:46 -07:00
Hadis Fard b31ee170f3 fixed indentations 2017-05-17 13:52:22 -07:00
Hadis Kakanejadi Fard 42ebf9465d removed sqlsrv variant const 2017-05-16 15:54:13 -07:00
Hadis Kakanejadi Fard 7904bddb6e added sql_variant const 2017-05-15 14:19:36 -07:00
yitam 75ee4f90ad modified sqlsrv test 2017-05-08 08:57:30 -07:00
yitam 28fc51df3d updated to ODBC 13.1 2017-05-05 17:17:52 -07:00
yitam 7d8004bf5a fixed indendations and tabs 2017-05-05 16:39:51 -07:00
yitam 1e527865a9 Implemented Azure AD plus tests 2017-05-05 16:28:33 -07:00
Hadis Kakanejadi Fard 4922e97b5d removed unused function (#383) 2017-05-04 18:15:39 -07:00
v-kaywon 68eca075ab rename g_henv_cp and g_henv_ncp to g_pdo_henv_.. and gg_ss_henv_.. to prevent name clashing problem in the pdo_sqlsrv and sqlsrv drivers 2017-04-06 15:44:04 -07:00
David Puglielli f330830eef Connection resiliency changes (#356)
* Connection resiliency changes

* Changed connres test to check appveyor protocol

* Changed connres test to check appveyor protocol

* Changed connres test to check appveyor protocol

* Reverted test because appveyor still won't use the correct protocol

* Removed unnecessary connres #defines from msodbcsql.h
2017-04-04 13:40:30 -07:00
v-kaywon f7983472a3 Merge pull request #335 from v-kaywon/driverorder
rename stmt_option_scrollable to driver specific names
2017-03-30 13:47:02 -07:00
v-kaywon 4057a9210d Update util.cpp 2017-03-28 09:37:11 -07:00
v-kaywon 9f3c0cee54 Update init.cpp 2017-03-23 11:55:33 -07:00
v-kaywon b4f7684db3 Update init.cpp
fix indentation
2017-03-23 10:57:35 -07:00
v-kaywon 6b2aa39e19 convert const char[] to char[] to avoid conversion warnings 2017-03-23 10:21:48 -07:00
v-kaywon ccd80a32d9 Update util.cpp 2017-03-21 17:00:13 -07:00
v-kaywon 06a343f611 rename stmt_option_scrollable to driver specific names and put get_error_message into namespace 2017-03-21 15:28:13 -07:00
Hadis Kakanejadi Fard 0782c56b41 updated versioning to semantic versioning #282 2017-03-03 16:55:28 -08:00
yitam f7a1c7296b use static cast for SQLSRV_ENCODING 2017-02-21 13:20:50 -08:00
yitam 8dc946d3f0 Merge branch 'dev' of https://github.com/Microsoft/msphpsql into GH231 2017-02-21 13:16:04 -08:00
Jenny Tam e448281049 Merge pull request #295 from v-kaywon/PHP71DebugAbort
fix PHP7.1 debug abort error
2017-02-21 12:54:24 -08:00
v-kaywon f5b9bd93f0 fix PHP7.1 debug abort error 2017-02-21 12:02:16 -08:00
yitam 0705d9b1a8 calculate field size instead of using column size and fixed the parameter encoding 2017-02-20 15:24:41 -08:00
v-dareck c35d998942 Fix clang compile errors. 2017-02-14 16:52:42 -08:00
yitam 010d23f7a1 removed inconsistent code calling convert_string_from_utf16 2017-02-02 14:20:50 -08:00
v-dareck ea445f4a18 Merge remote-tracking branch 'Microsoft/merged-codebase' into merged-codebase 2017-02-01 16:49:30 -08:00
yitam 3280d76682 modified ifdef __linux__ 2017-02-01 12:41:13 -08:00