From 53aaab847c5f906b8bb5da1419dfb6f33feffa3c Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Wed, 23 Dec 2020 19:23:06 -0800
Subject: [PATCH 1/4] Replaced problematic strlen if possible (#1226)

---
 azure-pipelines.yml                |  1 +
 source/pdo_sqlsrv/pdo_init.cpp     |  4 ++--
 source/pdo_sqlsrv/pdo_util.cpp     |  2 +-
 source/shared/core_stmt.cpp        |  6 +++---
 source/shared/localizationimpl.cpp | 19 +++++++++++++++----
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e93ed8cd6..3ce38ac14 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -84,6 +84,7 @@ jobs:
       sudo update-alternatives --set php-cgi /usr/bin/php-cgi$(phpver)
       sudo update-alternatives --set phar.phar /usr/bin/phar.phar$(phpver)
       sudo update-alternatives --set php-config /usr/bin/php-config$(phpver)
+      sudo phpdismod xdebug
       php -version
     displayName: 'Use PHP version $(phpver)'
 
diff --git a/source/pdo_sqlsrv/pdo_init.cpp b/source/pdo_sqlsrv/pdo_init.cpp
index 0c040159d..427397c7c 100644
--- a/source/pdo_sqlsrv/pdo_init.cpp
+++ b/source/pdo_sqlsrv/pdo_init.cpp
@@ -279,7 +279,7 @@ namespace {
         zend_class_entry* zend_class = php_pdo_get_dbh_ce(); 
         
         SQLSRV_ASSERT( zend_class != NULL, "REGISTER_PDO_SQLSRV_CLASS_CONST_LONG: php_pdo_get_dbh_ce failed");
-        zend_declare_class_constant_long(zend_class, const_cast<char*>(name), strlen(name), value);
+        zend_declare_class_constant_long(zend_class, const_cast<char*>(name), strnlen_s(name), value);
     }
 
     void REGISTER_PDO_SQLSRV_CLASS_CONST_STRING( _In_z_  char const* name, _In_z_ char const* value )
@@ -287,7 +287,7 @@ namespace {
         zend_class_entry* zend_class = php_pdo_get_dbh_ce(); 
 
         SQLSRV_ASSERT( zend_class != NULL, "REGISTER_PDO_SQLSRV_CLASS_CONST_STRING: php_pdo_get_dbh_ce failed");
-        zend_declare_class_constant_string(zend_class, const_cast<char*>(name), strlen(name), const_cast<char*>(value));
+        zend_declare_class_constant_string(zend_class, const_cast<char*>(name), strnlen_s(name), const_cast<char*>(value));
     }
 
     // array of pdo constants.
diff --git a/source/pdo_sqlsrv/pdo_util.cpp b/source/pdo_sqlsrv/pdo_util.cpp
index dd5f3179e..1613fa38e 100644
--- a/source/pdo_sqlsrv/pdo_util.cpp
+++ b/source/pdo_sqlsrv/pdo_util.cpp
@@ -37,7 +37,7 @@ char EXCEPTION_PROPERTY_ERRORINFO[] = "errorInfo";
 const int MAX_DIGITS = 11; // +-2 billion = 10 digits + 1 for the sign if negative
 
 // the warning message is not the error message alone; it must take WARNING_TEMPLATE above into consideration without the formats
-const int WARNING_MIN_LENGTH = static_cast<const int>( strlen( WARNING_TEMPLATE ) - strlen( "%1!s!%2!d!%3!s!" ));
+const int WARNING_MIN_LENGTH = static_cast<const int>( strnlen_s( WARNING_TEMPLATE ) - strnlen_s( "%1!s!%2!d!%3!s!" ));
 
 // Returns a sqlsrv_error for a given error code.
 sqlsrv_error_const* get_error_message( _In_opt_ unsigned int sqlsrv_error_code);
diff --git a/source/shared/core_stmt.cpp b/source/shared/core_stmt.cpp
index 1cc35c5a5..9e59a7da4 100644
--- a/source/shared/core_stmt.cpp
+++ b/source/shared/core_stmt.cpp
@@ -2356,7 +2356,7 @@ void format_decimal_numbers(_In_ SQLSMALLINT decimals_places, _In_ SQLSMALLINT f
 
     char buffer[50] = "  ";                  // A buffer with two blank spaces, as leeway
     int offset = 1 + is_negative; 
-    int src_length = strlen(src);
+    int src_length = strnlen_s(src);
 
     if (add_leading_zero) {
         buffer[offset++] = '0';
@@ -3054,7 +3054,7 @@ void adjustDecimalPrecision(_Inout_ zval* param_z, _In_ SQLSMALLINT decimal_digi
 			return;		// decimal point not found
 		}
 
-        int src_length = strlen(src);     
+        int src_length = strnlen_s(src);
         int num_decimals = src_length - (pt - src) - 1;
 		if (num_decimals <= decimal_digits) {
 			return;     // no need to adjust number of decimals
@@ -3151,7 +3151,7 @@ void adjustDecimalPrecision(_Inout_ zval* param_z, _In_ SQLSMALLINT decimal_digi
         buffer[0] = '-';
     }
 
-    zend_string* zstr = zend_string_init(buffer, strlen(buffer), 0);
+    zend_string* zstr = zend_string_init(buffer, strnlen_s(buffer), 0);
     zend_string_release(Z_STR_P(param_z));
     ZVAL_NEW_STR(param_z, zstr);
 }
diff --git a/source/shared/localizationimpl.cpp b/source/shared/localizationimpl.cpp
index ce850c819..e03590831 100644
--- a/source/shared/localizationimpl.cpp
+++ b/source/shared/localizationimpl.cpp
@@ -667,16 +667,22 @@ size_t SystemLocale::Utf8To16Strict( const char *src, SSIZE_T cchSrc, WCHAR *des
 
 size_t SystemLocale::ToUtf16( UINT srcCodePage, const char * src, SSIZE_T cchSrc, WCHAR * dest, size_t cchDest, DWORD * pErrorCode )
 {
+    if (cchSrc < 0) {
+        if (NULL != pErrorCode)
+            *pErrorCode = ERROR_INVALID_PARAMETER;
+        return 0;
+    }
+
     srcCodePage = ExpandSpecialCP( srcCodePage );
     if ( dest )
     {
         if ( srcCodePage == CP_UTF8 )
         {
-            return SystemLocale::Utf8To16( src, cchSrc < 0 ? (1+strlen(src)) : cchSrc, dest, cchDest, pErrorCode );
+            return SystemLocale::Utf8To16( src, cchSrc, dest, cchDest, pErrorCode );
         }
         else if ( srcCodePage == 1252 )
         {
-            return SystemLocale::CP1252ToUtf16( src, cchSrc < 0 ? (1+strlen(src)) : cchSrc, dest, cchDest, pErrorCode );
+            return SystemLocale::CP1252ToUtf16( src, cchSrc, dest, cchDest, pErrorCode );
         }
     }
     EncodingConverter cvt( CP_UTF16, srcCodePage );
@@ -693,16 +699,21 @@ size_t SystemLocale::ToUtf16( UINT srcCodePage, const char * src, SSIZE_T cchSrc
 
 size_t SystemLocale::ToUtf16Strict( UINT srcCodePage, const char * src, SSIZE_T cchSrc, WCHAR * dest, size_t cchDest, DWORD * pErrorCode )
 {
+    if (cchSrc < 0) {
+        if (NULL != pErrorCode)
+            *pErrorCode = ERROR_INVALID_PARAMETER;
+        return 0;
+    }
     srcCodePage = ExpandSpecialCP( srcCodePage );
     if ( dest )
     {
         if ( srcCodePage == CP_UTF8 )
         {
-            return SystemLocale::Utf8To16Strict( src, cchSrc < 0 ? (1+strlen(src)) : cchSrc, dest, cchDest, pErrorCode );
+            return SystemLocale::Utf8To16Strict( src, cchSrc, dest, cchDest, pErrorCode );
         }
         else if ( srcCodePage == 1252 )
         {
-            return SystemLocale::CP1252ToUtf16( src, cchSrc < 0 ? (1+strlen(src)) : cchSrc, dest, cchDest, pErrorCode );
+            return SystemLocale::CP1252ToUtf16( src, cchSrc, dest, cchDest, pErrorCode );
         }
     }
     EncodingConverter cvt( CP_UTF16, srcCodePage );

From 7afe00d23af206d18eea25c41430780bf74fcdf6 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Mon, 4 Jan 2021 18:28:07 -0800
Subject: [PATCH 2/4] Addressed static code analyis issues (prefast) (#1227)

---
 source/shared/core_sqlsrv.h |  2 +-
 source/shared/core_stmt.cpp | 29 +++++++++++++++--------------
 source/shared/core_util.cpp | 11 ++++++-----
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/source/shared/core_sqlsrv.h b/source/shared/core_sqlsrv.h
index fc7855e99..3a3a8af52 100644
--- a/source/shared/core_sqlsrv.h
+++ b/source/shared/core_sqlsrv.h
@@ -1444,7 +1444,7 @@ namespace data_classification {
     struct name_id_pair;
     struct sensitivity_metadata;
 
-    void name_id_pair_free(name_id_pair * pair);
+    void name_id_pair_free(_Inout_ name_id_pair * pair);
     void parse_sensitivity_name_id_pairs(_Inout_ sqlsrv_stmt* stmt, _Inout_ USHORT& numpairs, _Inout_ std::vector<name_id_pair*, sqlsrv_allocator<name_id_pair*>>* pairs, _Inout_ unsigned char **pptr);
     void parse_column_sensitivity_props(_Inout_ sensitivity_metadata* meta, _Inout_ unsigned char **pptr, _In_ bool getRankInfo);
     USHORT fill_column_sensitivity_array(_Inout_ sqlsrv_stmt* stmt, _In_ SQLSMALLINT colno, _Inout_ zval *column_data);
diff --git a/source/shared/core_stmt.cpp b/source/shared/core_stmt.cpp
index 9e59a7da4..d87231f85 100644
--- a/source/shared/core_stmt.cpp
+++ b/source/shared/core_stmt.cpp
@@ -2336,7 +2336,7 @@ void format_decimal_numbers(_In_ SQLSMALLINT decimals_places, _In_ SQLSMALLINT f
     //
 
     // Check if it's a negative number and if necessary to add the leading zero
-    bool is_negative = (*field_value == '-');
+    short is_negative = (*field_value == '-') ? 1 : 0;
     char *src = field_value + is_negative;
     bool add_leading_zero = false;
 
@@ -2354,12 +2354,12 @@ void format_decimal_numbers(_In_ SQLSMALLINT decimals_places, _In_ SQLSMALLINT f
         scale = field_scale;
     }
 
-    char buffer[50] = "  ";                  // A buffer with two blank spaces, as leeway
-    int offset = 1 + is_negative; 
+    char buffer[50] = "  ";             // A buffer with TWO blank spaces, as leeway
+    int offset = 1 + is_negative;       // for cases like 9.* to 10.* and the minus sign if needed
     int src_length = strnlen_s(src);
 
     if (add_leading_zero) {
-        buffer[offset++] = '0';
+        buffer[offset++] = '0';         // leading zero added
     }
     // Copy the original numerical value to the buffer
     memcpy_s(buffer + offset, src_length, src, src_length);
@@ -2375,10 +2375,11 @@ void format_decimal_numbers(_In_ SQLSMALLINT decimals_places, _In_ SQLSMALLINT f
         }
     }  
 
-    // Remove the extra white space if not used
-    char *p = buffer;
-    offset = 0;
-    while (isspace(*p++)) {
+    // Remove the extra white space if not used. For a negative number,
+    // the first pos is always a space
+    offset = is_negative;
+    char *p = buffer + offset;
+    while (*p++ == ' ') {
         offset++;
     }
     if (is_negative) {
@@ -3017,23 +3018,23 @@ void adjustDecimalPrecision(_Inout_ zval* param_z, _In_ SQLSMALLINT decimal_digi
         return;
     }
 
-    // If std::stold() succeeds, 'idx' is the position of the first character after the numerical value
+    // If std::stold() succeeds, 'index' is the position of the first character after the numerical value
     long double d = 0;
-    size_t idx;
+    size_t index;
     try {
-        d = std::stold(std::string(value), &idx);
+        d = std::stold(std::string(value), &index);
     }
     catch (const std::logic_error& ) {
         return;		// invalid input caused the conversion to throw an exception
     }
-    if (idx < value_len) {
+    if (index < value_len) {
         return;		// the input contains something else apart from the numerical value 
     }
 
     // Navigate to the first digit or the decimal point
-    bool is_negative = (d < 0);
+    short is_negative = (d < 0) ? 1 : 0;
     char *src = value + is_negative;
-    while (*src != DECIMAL_POINT && !isdigit(*src)) {
+    while (*src != DECIMAL_POINT && !isdigit(static_cast<unsigned int>(*src))) {
         src++;
     }
 
diff --git a/source/shared/core_util.cpp b/source/shared/core_util.cpp
index 127a68e21..1b8a2d667 100644
--- a/source/shared/core_util.cpp
+++ b/source/shared/core_util.cpp
@@ -72,7 +72,7 @@ SQLCHAR SSPWARN[] = "01SSP";
 // the script (sqlsrv_configure).
 void write_to_log( _In_ unsigned int severity, _In_ const char* msg, ...)
 {
-    SQLSRV_ASSERT( !(g_driver_severity == NULL), "Must register a driver checker function." );
+    SQLSRV_ASSERT(g_driver_severity != NULL, "Must register a driver checker function.");
     if (!g_driver_severity(severity)) {
         return;
     }
@@ -491,11 +491,11 @@ namespace data_classification {
     const char* ID = "id";
     const char* RANK = "rank";
 
-    void convert_sensivity_field(_Inout_ sqlsrv_stmt* stmt, _In_ SQLSRV_ENCODING encoding, _In_ unsigned char *ptr, _In_ int len, _Inout_updates_bytes_(cchOutLen) char** field_name)
+    void convert_sensivity_field(_Inout_ sqlsrv_stmt* stmt, _In_ SQLSRV_ENCODING encoding, _In_ unsigned char *ptr, _In_ int len, _Inout_updates_bytes_(field_name_len) char** field_name, _Out_ SQLLEN& field_name_len)
     {
         sqlsrv_malloc_auto_ptr<SQLWCHAR> temp_field_name;
         int temp_field_len = len * sizeof(SQLWCHAR);
-        SQLLEN field_name_len = 0;
+        field_name_len = 0;
 
         if (len == 0) {
             *field_name = reinterpret_cast<char*>(sqlsrv_malloc(1));
@@ -538,6 +538,7 @@ namespace data_classification {
         while (npairs--) {
             int namelen, idlen;
             unsigned char *nameptr, *idptr;
+            SQLLEN field_len;
 
             sqlsrv_malloc_auto_ptr<name_id_pair> pair;
             pair = new(sqlsrv_malloc(sizeof(name_id_pair))) name_id_pair();
@@ -549,7 +550,7 @@ namespace data_classification {
             nameptr = ptr;
 
             pair->name_len = namelen; 
-            convert_sensivity_field(stmt, encoding, nameptr, namelen, (char**)&name);
+            convert_sensivity_field(stmt, encoding, nameptr, namelen, (char**)&name, field_len);
             pair->name = name;
 
             ptr += namelen * 2;
@@ -558,7 +559,7 @@ namespace data_classification {
             ptr += idlen * 2;
 
             pair->id_len = idlen;
-            convert_sensivity_field(stmt, encoding, idptr, idlen, (char**)&id);
+            convert_sensivity_field(stmt, encoding, idptr, idlen, (char**)&id, field_len);
             pair->id = id;
 
             pairs->push_back(pair.get());

From 7b961b0028a46dcb1eb086e74b676fbc8515ded4 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Thu, 14 Jan 2021 15:37:44 -0800
Subject: [PATCH 3/4] Updated version, change log and installation instructions
 for 5.9.0 (#1228)

---
 CHANGELOG.md            |  50 ++++++++++
 LICENSE                 |   2 +-
 Linux-mac-install.md    | 216 ++++++++++++++++++++++++++--------------
 source/shared/version.h |  12 +--
 4 files changed, 199 insertions(+), 81 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1eebfd58e..0482dd3f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,56 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## 5.9.0 - 2021-01-29
+Updated PECL release packages. Here is the list of updates:
+
+### Added
+- Support for PHP 8.0
+- Support for macOS Big Sur, Ubuntu 20.04, Ubuntu 20.10 and Alpine 3.12
+- Support for GB18030 locale [#1115](
+https://github.com/microsoft/msphpsql/pull/1115)
+- Feature Request [#924](https://github.com/microsoft/msphpsql/issues/924) - extended PDO errorinfo to include [additional odbc messages if available](https://docs.microsoft.com/sql/connect/php/pdo-errorinfo) - pull request [#1133](
+https://github.com/microsoft/msphpsql/pull/1133)
+- [Data Classification with rank info](https://github.com/microsoft/msphpsql/wiki/Features#dataClass), which requires [MS ODBC Driver 17.4.2+](https://docs.microsoft.com/sql/connect/odbc/download-odbc-driver-for-sql-server) and [SQL Server 2019](https://www.microsoft.com/sql-server/sql-server-2019) or an Azure SQL instance that supports it
+- [Azure Active Directory Service Principal authentication support](https://docs.microsoft.com/sql/connect/php/azure-active-directory), which requires [MS ODBC Driver 17.7+](https://docs.microsoft.com/sql/connect/odbc/download-odbc-driver-for-sql-server)
+
+### Removed
+- Dropped support for PHP 7.2
+- Dropped support for macOS High Sierra, Ubuntu 19.10 and Debian 8
+
+### Fixed
+- Pull Request [#1127](https://github.com/microsoft/msphpsql/pull/1127) - removed TSRMLS macros in preparation for PHP 8 by remicollet
+- Pull Request [#1136](https://github.com/microsoft/msphpsql/pull/1136) - improved performance when handling decimal numbers as inputs or outputs and removed unncessary conversions for numeric values
+- Pull Request [#1143](https://github.com/microsoft/msphpsql/pull/1143) - if an exception occurs when executing a query, it will not change the output parameters
+- Pull Request [#1144](https://github.com/microsoft/msphpsql/pull/1144) - use the correct C types when binding output parameters with integer values
+- Pull Request [#1146](https://github.com/microsoft/msphpsql/pull/1146) - improved performance when fetching numbers using client buffers
+- Pull Request [#1165](https://github.com/microsoft/msphpsql/pull/1165) - set query timeout without using LOCK TIMEOUT, which saves an extra trip to the server
+- Issue [#1170](https://github.com/microsoft/msphpsql/issues/1170) - when fetching large data types such as ntext, check more than only the display size - pull request [#1172](https://github.com/microsoft/msphpsql/pull/1172)
+- Pull Request [#1205](https://github.com/microsoft/msphpsql/pull/1205) - minimized compilation warnings on Linux and macOS 
+- Pull Request [#1209](https://github.com/microsoft/msphpsql/pull/1209) - fixed a bug when fetching varbinary max fields as char or wide chars
+- Issue [#1210](https://github.com/microsoft/msphpsql/issues/1210) - switched from preview to beta terminology to enable Pickle support
+- Issue [#1213](https://github.com/microsoft/msphpsql/issues/1213) - the MACOSX_DEPLOYMENT_TARGET in config files caused linker errors in macOS Big Sur - Pull Request [#1215](https://github.com/microsoft/msphpsql/pull/1215)
+- Pull Request [#1226](https://github.com/microsoft/msphpsql/pull/1226) - replaced the problematic strlen function 
+- Pull Request [#1227](https://github.com/microsoft/msphpsql/pull/1227) - addressed static code analyis issues
+
+### Limitations
+- No support for inout / output params when using sql_variant type
+- No support for inout / output params when formatting decimal values
+- In Linux and macOS, setlocale() only takes effect if it is invoked before the first connection. Attempting to set the locale after connecting will not work
+- Always Encrypted requires [MS ODBC Driver 17+](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server)
+  - Only Windows Certificate Store and Azure Key Vault are supported. Custom Keystores are not yet supported
+  - Issue [#716](https://github.com/Microsoft/msphpsql/issues/716) - With Always Encrypted enabled, named parameters in subqueries are not supported
+  - Issue [#1050](https://github.com/microsoft/msphpsql/issues/1050) - With Always Encrypted enabled, insertion requires the column list for any tables with identity columns
+  - [Always Encrypted limitations](https://docs.microsoft.com/sql/connect/php/using-always-encrypted-php-drivers#limitations-of-the-php-drivers-when-using-always-encrypted)
+
+### Known Issues
+- This release requires ODBC Driver 17.4.2 or above. Otherwise, a warning about failing to set an attribute may be suppressed when using an older ODBC driver.
+- Connection pooling on Linux or macOS is not recommended with [unixODBC](http://www.unixodbc.org/) < 2.3.7
+- When pooling is enabled in Linux or macOS
+  - unixODBC <= 2.3.4 (Linux and macOS) might not return proper diagnostic information, such as error messages, warnings and informative messages
+  - due to this unixODBC bug, fetch large data (such as xml, binary) as streams as a workaround. See the examples [here](https://github.com/Microsoft/msphpsql/wiki/Features#pooling)
+
+
 ## 5.9.0-beta2 - 2020-12-02
 Updated PECL release packages. Here is the list of updates:
 
diff --git a/LICENSE b/LICENSE
index a58c37dba..6b4b06b49 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright(c) 2020 Microsoft Corporation
+Copyright(c) 2021 Microsoft Corporation
 All rights reserved.
 
 MIT License
diff --git a/Linux-mac-install.md b/Linux-mac-install.md
index 2c82d003e..7c2452e2c 100644
--- a/Linux-mac-install.md
+++ b/Linux-mac-install.md
@@ -1,11 +1,13 @@
 # Linux and macOS Installation Tutorial for the Microsoft Drivers for PHP for SQL Server
-The following instructions assume a clean environment and show how to install PHP 7.3+, the Microsoft ODBC driver, the Apache web server, and the Microsoft Drivers for PHP for SQL Server on Ubuntu 16.04, 18.04, and 20.04, RedHat 7 and 8, Debian 9 and 10, Suse 12 and 15, Alpine 3.11 and 3.12, and macOS 10.13, 10.14, and 10.15. These instructions advise installing the drivers using PECL, but you can also download the prebuilt binaries from the [Microsoft Drivers for PHP for SQL Server](https://github.com/Microsoft/msphpsql/releases) Github project page and install them following the instructions in [Loading the Microsoft Drivers for PHP for SQL Server](https://docs.microsoft.com/sql/connect/php/loading-the-php-sql-driver). For an explanation of extension loading and why we do not add the extensions to php.ini, see the section on [loading the drivers](https://docs.microsoft.com/sql/connect/php/loading-the-php-sql-driver#loading-the-driver-at-php-startup).
+The following instructions assume a clean environment and show how to install PHP 8.0, the Microsoft ODBC driver, the Apache web server, and the Microsoft Drivers for PHP for SQL Server on Ubuntu 16.04, 18.04, and 20.04, RedHat 7 and 8, Debian 9 and 10, Suse 12 and 15, Alpine 3.11 and 3.12, and macOS 10.14, 10.15, and 11.0. These instructions advise installing the drivers using PECL, but you can also download the prebuilt binaries from the [Microsoft Drivers for PHP for SQL Server](https://github.com/Microsoft/msphpsql/releases) Github project page and install them following the instructions in [Loading the Microsoft Drivers for PHP for SQL Server](https://docs.microsoft.com/sql/connect/php/loading-the-php-sql-driver). For an explanation of extension loading and why we do not add the extensions to php.ini, see the section on [loading the drivers](https://docs.microsoft.com/sql/connect/php/loading-the-php-sql-driver#loading-the-driver-at-php-startup).
 
-The following instructions install PHP 8.0 by default using `pecl install` if PHP 8.0 packages are available. You may need to run `pecl channel-update pecl.php.net` first. Note that some supported Linux distros default to PHP 7.1 or earlier, which is not supported for the latest version of the PHP drivers for SQL Server -- please see the notes at the beginning of each section to install PHP 7.4 or 7.3 instead.
+The following instructions install PHP 8.0 by default using `pecl install`, if the PHP 8.0 packages are available. You may need to run `pecl channel-update pecl.php.net` first. Note that some supported Linux distros default to PHP 7.1 or earlier, which is not supported for the latest version of the PHP drivers for SQL Server -- please see the notes at the beginning of each section to install PHP 7.4 or 7.3 instead.
 
-Also included are instructions for installing the PHP FastCGI Process Manager, PHP-FPM, on Ubuntu. This is needed if using the nginx web server instead of Apache.
+Also included are instructions for installing the PHP FastCGI Process Manager, PHP-FPM, on Ubuntu. This is needed if you are using the nginx web server instead of Apache.
 
-## Contents of this page:
+While these instructions contain commands to install both SQLSRV and PDO_SQLSRV drivers, the drivers can be installed and function independently. Users comfortable with customizing their configuration can adjust these instructions to be specific to SQLSRV or PDO_SQLSRV. Both drivers have the same dependencies except where noted below.
+
+## Contents of this page
 
 - [Installing the drivers on Ubuntu 16.04, 18.04, and 20.04](#installing-the-drivers-on-ubuntu-1604-1804-and-2004)
 - [Installing the drivers with PHP-FPM on Ubuntu](#installing-the-drivers-with-php-fpm-on-ubuntu)
@@ -13,7 +15,7 @@ Also included are instructions for installing the PHP FastCGI Process Manager, P
 - [Installing the drivers on Debian 9 and 10](#installing-the-drivers-on-debian-9-and-10)
 - [Installing the drivers on Suse 12 and 15](#installing-the-drivers-on-suse-12-and-15)
 - [Installing the drivers on Alpine 3.11 and 3.12](#installing-the-drivers-on-alpine-311-and-312)
-- [Installing the drivers on macOS High Sierra, Mojave, and Catalina](#installing-the-drivers-on-macos-high-sierra-mojave-and-catalina)
+- [Installing the drivers on macOS Mojave, Catalina and Big Sur](#installing-the-drivers-on-macos-mojave-catalina-and-big-sur)
 
 ## Installing the drivers on Ubuntu 16.04, 18.04, and 20.04
 
@@ -28,12 +30,12 @@ apt-get update
 apt-get install php8.0 php8.0-dev php8.0-xml -y --allow-unauthenticated
 ```
 ### Step 2. Install prerequisites
-Install the ODBC driver for Ubuntu by following the instructions on [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
+Install the ODBC driver for Ubuntu by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
 
 ### Step 3. Install the PHP drivers for Microsoft SQL Server
-```
-sudo pecl install sqlsrv-5.9.0beta2
-sudo pecl install pdo_sqlsrv-5.9.0beta2
+```bash
+sudo pecl install sqlsrv
+sudo pecl install pdo_sqlsrv
 sudo su
 printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.0/mods-available/sqlsrv.ini
 printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.0/mods-available/pdo_sqlsrv.ini
@@ -44,7 +46,7 @@ sudo phpenmod -v 8.0 sqlsrv pdo_sqlsrv
 If there is only one PHP version in the system, then the last step can be simplified to `phpenmod sqlsrv pdo_sqlsrv`.
 
 ### Step 4. Install Apache and configure driver loading
-```
+```bash
 sudo su
 apt-get install libapache2-mod-php8.0 apache2
 a2dismod mpm_event
@@ -53,7 +55,7 @@ a2enmod php8.0
 exit
 ```
 ### Step 5. Restart Apache and test the sample script
-```
+```bash
 sudo service apache2 restart
 ```
 To test your installation, see [Testing your installation](#testing-your-installation) at the end of this document.
@@ -68,20 +70,20 @@ To test your installation, see [Testing your installation](#testing-your-install
 sudo su
 add-apt-repository ppa:ondrej/php -y
 apt-get update
-apt-get install php8.0 php8.0-dev php8.0-xml -y --allow-unauthenticated
+apt-get install php8.0 php8.0-dev php8.0-fpm php8.0-xml -y --allow-unauthenticated
 ```
 Verify the status of the PHP-FPM service by running
-```
+```bash
 systemctl status php8.0-fpm
 ```
 ### Step 2. Install prerequisites
-Install the ODBC driver for Ubuntu by following the instructions on [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
+Install the ODBC driver for Ubuntu by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
 
 ### Step 3. Install the PHP drivers for Microsoft SQL Server
-```
+```bash
 sudo pecl config-set php_ini /etc/php/8.0/fpm/php.ini
-sudo pecl install sqlsrv-5.9.0beta2
-sudo pecl install pdo_sqlsrv-5.9.0beta2
+sudo pecl install sqlsrv
+sudo pecl install pdo_sqlsrv
 sudo su
 printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.0/mods-available/sqlsrv.ini
 printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.0/mods-available/pdo_sqlsrv.ini
@@ -91,16 +93,16 @@ sudo phpenmod -v 8.0 sqlsrv pdo_sqlsrv
 If there is only one PHP version in the system, then the last step can be simplified to `phpenmod sqlsrv pdo_sqlsrv`.
 
 Verify that `sqlsrv.ini` and `pdo_sqlsrv.ini` are located in `/etc/php/8.0/fpm/conf.d/`:
-```
+```bash
 ls /etc/php/8.0/fpm/conf.d/*sqlsrv.ini
 ```
 Restart the PHP-FPM service:
-```
+```bash
 sudo systemctl restart php8.0-fpm
 ```
 
 ### Step 4. Install and configure nginx
-```
+```bash
 sudo apt-get update
 sudo apt-get install nginx
 sudo systemctl status nginx
@@ -110,7 +112,7 @@ To configure nginx, you must edit the `/etc/nginx/sites-available/default` file.
 # Add index.php to the list if you are using PHP
 index index.html index.htm index.nginx-debian.html index.php;
 ```
-Next, modify the section following `# pass PHP scripts to FastCGI server` as follows:
+Next, uncomment and modify the section following `# pass PHP scripts to FastCGI server` as follows:
 ```
 # pass PHP scripts to FastCGI server
 #
@@ -120,7 +122,7 @@ location ~ \.php$ {
 }
 ```
 ### Step 5. Restart nginx and test the sample script
-```
+```bash
 sudo systemctl restart nginx.service
 ```
 To test your installation, see [Testing your installation](#testing-your-installation) at the end of this document.
@@ -132,7 +134,7 @@ To test your installation, see [Testing your installation](#testing-your-install
 To install PHP on Red Hat 7, run the following:
 > [!NOTE]
 > To install PHP 7.4 or 7.3, replace remi-php80 with remi-php74 or remi-php73 respectively in the following commands.
-```
+```bash
 sudo su
 yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 yum install https://rpms.remirepo.net/enterprise/remi-release-7.rpm
@@ -140,13 +142,14 @@ subscription-manager repos --enable=rhel-7-server-optional-rpms
 yum install yum-utils
 yum-config-manager --enable remi-php80
 yum update
+# Note: The php-pdo package is required only for the PDO_SQLSRV driver
 yum install php php-pdo php-xml php-pear php-devel re2c gcc-c++ gcc
 ```
 
 To install PHP on Red Hat 8, run the following:
 > [!NOTE]
 > To install PHP 7.4 or 7.3, replace remi-8.0 with remi-7.4 or remi-7.3 respectively in the following commands.
-```
+```bash
 sudo su
 dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 dnf install https://rpms.remirepo.net/enterprise/remi-release-8.rpm
@@ -155,16 +158,17 @@ dnf module reset php
 dnf module install php:remi-8.0
 subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
 dnf update
+# Note: The php-pdo package is required only for the PDO_SQLSRV driver
 dnf install php-pdo php-pear php-devel
 ```
 
 ### Step 2. Install prerequisites
-Install the ODBC driver for Red Hat 7 or 8 by following the instructions on [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
+Install the ODBC driver for Red Hat 7 or 8 by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
 
 ### Step 3. Install the PHP drivers for Microsoft SQL Server
-```
-sudo pecl install sqlsrv-5.9.0beta2
-sudo pecl install pdo_sqlsrv-5.9.0beta2
+```bash
+sudo pecl install sqlsrv
+sudo pecl install pdo_sqlsrv
 sudo su
 echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini
 echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini
@@ -172,19 +176,19 @@ exit
 ```
 
 You can alternatively install from the Remi repo:
-```
+```bash
 sudo yum install php-sqlsrv
 ```
 ### Step 4. Install Apache
-```
+```bash
 sudo yum install httpd
 ```
 SELinux is installed by default and runs in Enforcing mode. To allow Apache to connect to databases through SELinux, run the following command:
-```
+```bash
 sudo setsebool -P httpd_can_network_connect_db 1
 ```
 ### Step 5. Restart Apache and test the sample script
-```
+```bash
 sudo apachectl restart
 ```
 To test your installation, see [Testing your installation](#testing-your-installation) at the end of this document.
@@ -195,7 +199,7 @@ To test your installation, see [Testing your installation](#testing-your-install
 > To install PHP 7.4 or 7.3, replace 8.0 in the following commands with 7.4 or 7.3.
 
 ### Step 1. Install PHP
-```
+```bash
 sudo su
 apt-get install curl apt-transport-https
 wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
@@ -204,10 +208,10 @@ apt-get update
 apt-get install -y php8.0 php8.0-dev php8.0-xml php8.0-intl
 ```
 ### Step 2. Install prerequisites
-Install the ODBC driver for Debian by following the instructions on [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15). 
+Install the ODBC driver for Debian by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15). 
 
 You may also need to generate the correct locale to get PHP output to display correctly in a browser. For example, for the en_US UTF-8 locale, run the following commands:
-```
+```bash
 sudo su
 sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen
 locale-gen
@@ -215,9 +219,9 @@ locale-gen
 You may need to add `/usr/sbin` to your `$PATH`, as the `locale-gen` executable is located there.
 
 ### Step 3. Install the PHP drivers for Microsoft SQL Server
-```
-sudo pecl install sqlsrv-5.9.0beta2
-sudo pecl install pdo_sqlsrv-5.9.0beta2
+```bash
+sudo pecl install sqlsrv
+sudo pecl install pdo_sqlsrv
 sudo su
 printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.0/mods-available/sqlsrv.ini
 printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.0/mods-available/pdo_sqlsrv.ini
@@ -228,7 +232,7 @@ sudo phpenmod -v 8.0 sqlsrv pdo_sqlsrv
 If there is only one PHP version in the system, then the last step can be simplified to `phpenmod sqlsrv pdo_sqlsrv`. As with `locale-gen`, `phpenmod` is located in `/usr/sbin` so you may need to add this directory to your `$PATH`.
 
 ### Step 4. Install Apache and configure driver loading
-```
+```bash
 sudo su
 apt-get install libapache2-mod-php8.0 apache2
 a2dismod mpm_event
@@ -236,7 +240,7 @@ a2enmod mpm_prefork
 a2enmod php8.0
 ```
 ### Step 5. Restart Apache and test the sample script
-```
+```bash
 sudo service apache2 restart
 ```
 To test your installation, see [Testing your installation](#testing-your-installation) at the end of this document.
@@ -252,29 +256,29 @@ To test your installation, see [Testing your installation](#testing-your-install
       `https://download.opensuse.org/repositories/devel:/languages:/php:/php73/<SuseVersion>/devel:languages:php:php73.repo`.
 
 ### Step 1. Install PHP
-```
+```bash
 sudo su
 zypper -n ar -f https://download.opensuse.org/repositories/devel:languages:php/<SuseVersion>/devel:languages:php.repo
 zypper --gpg-auto-import-keys refresh
 zypper -n install php7 php7-devel php7-openssl
 ```
 ### Step 2. Install prerequisites
-Install the ODBC driver for Suse by following the instructions on [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
+Install the ODBC driver for Suse by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15).
 
 ### Step 3. Install the PHP drivers for Microsoft SQL Server
 > [!NOTE]
 > If you get an error message saying `Connection to 'pecl.php.net:443' failed: Unable to find the socket transport "ssl"`, edit the pecl script at /usr/bin/pecl and remove the `-n` switch in the last line. This switch prevents PECL from loading ini files when PHP is called, which prevents the OpenSSL extension from loading.
 
-```
-sudo pecl install sqlsrv-5.9.0beta2
-sudo pecl install pdo_sqlsrv-5.9.0beta2
+```bash
+sudo pecl install sqlsrv
+sudo pecl install pdo_sqlsrv
 sudo su
 echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/pdo_sqlsrv.ini
 echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/sqlsrv.ini
 exit
 ```
 ### Step 4. Install Apache and configure driver loading
-```
+```bash
 sudo su
 zypper install apache2 apache2-mod_php7
 a2enmod php7
@@ -283,7 +287,7 @@ echo "extension=pdo_sqlsrv.so" >> /etc/php7/apache2/php.ini
 exit
 ```
 ### Step 5. Restart Apache and test the sample script
-```
+```bash
 sudo systemctl restart apache2
 ```
 To test your installation, see [Testing your installation](#testing-your-installation) at the end of this document.
@@ -291,46 +295,47 @@ To test your installation, see [Testing your installation](#testing-your-install
 ## Installing the drivers on Alpine 3.11 and 3.12
 
 > [!NOTE]
-> The default version of PHP is 7.3. Alternate versions of PHP may be available from other repositories for Alpine. You can instead compile PHP from source.
+> The default version of PHP is 7.3. PHP 7.4 or above may be available from testing or edge repositories for Alpine. You can instead compile PHP from source.
 
 ### Step 1. Install PHP
 PHP packages for Alpine can be found in the `edge/community` repository. Please check [Enable Community Repository](https://wiki.alpinelinux.org/wiki/Enable_Community_Repository) on their WIKI page. Add the following line to `/etc/apk/repositories`, replacing `<mirror>` with the URL of an Alpine repository mirror:
-```
+```bash
 http://<mirror>/alpine/edge/community
 ```
 Then run:
-```
+```bash
 sudo su
 apk update
+# Note: The php7-pdo package is required only for the PDO_SQLSRV driver
 apk add php7 php7-dev php7-pear php7-pdo php7-openssl autoconf make g++
 ```
 ### Step 2. Install prerequisites
-Install the ODBC driver for Alpine by following the instructions on [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15). 
+Install the ODBC driver for Alpine by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (Linux)](https://docs.microsoft.com/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15). 
 
 ### Step 3. Install the PHP drivers for Microsoft SQL Server
-```
-sudo pecl install sqlsrv-5.9.0beta2
-sudo pecl install pdo_sqlsrv-5.9.0beta2
+```bash
+sudo pecl install sqlsrv
+sudo pecl install pdo_sqlsrv
 sudo su
 echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/10_pdo_sqlsrv.ini
 echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/00_sqlsrv.ini
 ```
 
 ### Step 4. Install Apache and configure driver loading
-```
+```bash
 sudo apk add php7-apache2 apache2
 ```
 ### Step 5. Restart Apache and test the sample script
-```
+```bash
 sudo rc-service apache2 restart
 ```
 To test your installation, see [Testing your installation](#testing-your-installation) at the end of this document.
 
 
-## Installing the drivers on macOS High Sierra, Mojave, and Catalina
+## Installing the drivers on macOS Mojave, Catalina and Big Sur
 
 If you do not already have it, install brew as follows:
-```
+```bash
 /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 ```
 
@@ -339,45 +344,45 @@ If you do not already have it, install brew as follows:
 
 ### Step 1. Install PHP
 
-```
+```bash
 brew tap
 brew tap homebrew/core
 brew install php@8.0
 ```
-PHP should now be in your path -- run `php -v` to verify that you are running the correct version of PHP. If PHP is not in your path or it is not the correct version, run the following:
-```
+PHP should now be in your path. Run `php -v` to verify that you are running the correct version of PHP. If PHP is not in your path or it is not the correct version, run the following:
+```bash
 brew link --force --overwrite php@8.0
 ```
 
 ### Step 2. Install prerequisites
-Install the ODBC driver for macOS by following the instructions on [Install the Microsoft ODBC driver for SQL Server (macOS)](
+Install the ODBC driver for macOS by following the instructions on the [Install the Microsoft ODBC driver for SQL Server (macOS)](
 https://docs.microsoft.com/sql/connect/odbc/linux-mac/install-microsoft-odbc-driver-sql-server-macos?view=sql-server-ver15). 
 
 In addition, you may need to install the GNU make tools:
-```
+```bash
 brew install autoconf automake libtool
 ```
 
 ### Step 3. Install the PHP drivers for Microsoft SQL Server
-```
-sudo pecl install sqlsrv-5.9.0beta2
-sudo pecl install pdo_sqlsrv-5.9.0beta2
+```bash
+sudo pecl install sqlsrv
+sudo pecl install pdo_sqlsrv
 ```
 ### Step 4. Install Apache and configure driver loading
-```
+```bash
 brew install apache2
 ```
 To find the Apache configuration file, `httpd.conf`, for your Apache installation, run 
-```
+```bash
 /usr/local/bin/apachectl -V | grep SERVER_CONFIG_FILE
 ``` 
 The following commands append the required configuration to `httpd.conf`. Be sure to substitute the path returned by the preceding command in place of `/usr/local/etc/httpd/httpd.conf`:
-```
+```bash
 echo "LoadModule php7_module /usr/local/opt/php@8.0/lib/httpd/modules/libphp7.so" >> /usr/local/etc/httpd/httpd.conf
 (echo "<FilesMatch .php$>"; echo "SetHandler application/x-httpd-php"; echo "</FilesMatch>";) >> /usr/local/etc/httpd/httpd.conf
 ```
 ### Step 5. Restart Apache and test the sample script
-```
+```bash
 sudo apachectl restart
 ```
 To test your installation, see [Testing your installation](#testing-your-installation) at the end of this document.
@@ -385,7 +390,10 @@ To test your installation, see [Testing your installation](#testing-your-install
 ## Testing Your Installation
 
 To test this sample script, create a file called testsql.php in your system's document root. This is `/var/www/html/` on Ubuntu, Debian, and Redhat, `/srv/www/htdocs` on SUSE, `/var/www/localhost/htdocs` on Alpine, or `/usr/local/var/www` on macOS. Copy the following script to it, replacing the server, database, username, and password as appropriate.
-```
+
+### SQLSRV example
+
+```php
 <?php
 $serverName = "yourServername";
 $connectionOptions = array(
@@ -394,6 +402,15 @@ $connectionOptions = array(
     "pwd" => "yourPassword"
 );
 
+function exception_handler($exception) {
+    echo "<h1>Failure</h1>";
+    echo "Uncaught exception: " , $exception->getMessage();
+    echo "<h1>PHP Info for troubleshooting</h1>";
+    phpinfo();
+}
+
+set_exception_handler('exception_handler');
+
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 if ($conn === false) {
@@ -412,7 +429,7 @@ if ($stmt === false) {
 }
 ?>
 
-<h1> Results : </h1>
+<h1> Success Results : </h1>
 
 <?php
 while ($row = sqlsrv_fetch_array($stmt, SQLSRV_FETCH_ASSOC)) {
@@ -425,6 +442,7 @@ sqlsrv_close($conn);
 function formatErrors($errors)
 {
     // Display errors
+    echo "<h1>SQL Error:</h1>";
     echo "Error information: <br/>";
     foreach ($errors as $error) {
         echo "SQLSTATE: ". $error['SQLSTATE'] . "<br/>";
@@ -434,4 +452,56 @@ function formatErrors($errors)
 }
 ?>
 ```
-Point your browser to https://localhost/testsql.php (https://localhost:8080/testsql.php on macOS). You should now be able to connect to your SQL Server/Azure SQL database.
+
+### PDO_SQLSRV example
+
+```php
+<?php
+try {
+    $serverName = "yourServername";
+    $databaseName = "yourDatabase";
+    $uid = "yourUsername";
+    $pwd = "yourPassword";
+    
+    $conn = new PDO("sqlsrv:server = $serverName; Database = $databaseName;", $uid, $pwd);
+
+    // Select Query
+    $tsql = "SELECT @@Version AS SQL_VERSION";
+
+    // Executes the query
+    $stmt = $conn->query($tsql);
+} catch (PDOException $exception1) {
+    echo "<h1>Caught PDO exception:</h1>";
+    echo $exception1->getMessage() . PHP_EOL;
+    echo "<h1>PHP Info for troubleshooting</h1>";
+    phpinfo();
+}
+
+?>
+
+<h1> Success Results : </h1>
+
+<?php
+try {
+    while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+        echo $row['SQL_VERSION'] . PHP_EOL;
+    }
+} catch (PDOException $exception2) {
+    // Display errors
+    echo "<h1>Caught PDO exception:</h1>";
+    echo $exception2->getMessage() . PHP_EOL;
+}
+
+unset($stmt);
+unset($conn);
+?>
+```
+
+Point your browser to https://localhost/testsql.php (https://localhost:8080/testsql.php on macOS). You should now be able to connect to your SQL Server/Azure SQL database. If you don't see a success message showing SQL version information, you can do some basic troubleshooting by running the script from the command line:
+
+```bash
+php testsql.php
+```
+
+If running from the command line is successful but nothing shows in your browser, check the [Apache log files](https://linuxize.com/post/apache-log-files/#location-of-the-log-files). For additional help, see [Support resources](support-resources-for-the-php-sql-driver.md) for places to go.
+
diff --git a/source/shared/version.h b/source/shared/version.h
index d8bf6ac0f..934665198 100644
--- a/source/shared/version.h
+++ b/source/shared/version.h
@@ -31,7 +31,7 @@
 #define SQLVERSION_BUILD 0
 
 // For previews, set this constant to 1, 2 and so on. Otherwise, set it to 0
-#define PREVIEW 2
+#define PREVIEW 0
 #define SEMVER_PRERELEASE
 
 // Semantic versioning build metadata, build meta data is not counted in precedence order.
@@ -47,9 +47,7 @@
 
 // Semantic versioning: 
 // For stable releases leave SEMVER_PRERELEASE empty
-// Otherwise, for pre-releases, add '-' and change it to:
-// "RC" for release candidates
-// "preview" for ETP 
+// Otherwise, for pre-releases, add '-' and change it to "beta" with a preview number
 #if PREVIEW > 0
 #undef SEMVER_PRERELEASE
 #define SEMVER_PRERELEASE "beta" STRINGIFY(PREVIEW)
@@ -60,8 +58,8 @@
 
 #define _FILEVERSION            SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD
 
-// PECL package version macros ('-' or '+' is not allowed)
-#define PHP_SQLSRV_VERSION      "5.9.0beta2"
-#define PHP_PDO_SQLSRV_VERSION  "5.9.0beta2"
+// PECL package version ('-' or '+' is not allowed) - to support Pickle do not use macros below
+#define PHP_SQLSRV_VERSION      "5.9.0"
+#define PHP_PDO_SQLSRV_VERSION  "5.9.0"
 
 #endif // VERSION_H

From 6d2b93881f485a6feb54739d1ff30fcb42ef58c3 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Fri, 15 Jan 2021 10:02:35 -0800
Subject: [PATCH 4/4] Changed keyword to ActiveDirectoryServicePrincipal
 (#1229)

---
 azure-pipelines.yml                                           | 1 +
 source/pdo_sqlsrv/pdo_util.cpp                                | 2 +-
 source/shared/core_conn.cpp                                   | 2 +-
 source/sqlsrv/util.cpp                                        | 2 +-
 test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt   | 2 +-
 .../functional/pdo_sqlsrv/pdo_azure_ad_service_principal.phpt | 4 ++--
 test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt    | 4 ++--
 test/functional/sqlsrv/sqlsrv_azure_ad_service_principal.phpt | 4 ++--
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3ce38ac14..57824f77c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -313,6 +313,7 @@ jobs:
       php --ri sqlsrv
       php --ri pdo_sqlsrv
     displayName: 'Load drivers'
+    condition: false
 
   - script: |
       docker pull microsoft/mssql-server-windows-developer
diff --git a/source/pdo_sqlsrv/pdo_util.cpp b/source/pdo_sqlsrv/pdo_util.cpp
index 1613fa38e..bab79c992 100644
--- a/source/pdo_sqlsrv/pdo_util.cpp
+++ b/source/pdo_sqlsrv/pdo_util.cpp
@@ -379,7 +379,7 @@ pdo_error PDO_ERRORS[] = {
     },
     {
         PDO_SQLSRV_ERROR_INVALID_AUTHENTICATION_OPTION,
-        { IMSSP, (SQLCHAR*) "Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectorySPA is supported.", -73, false }
+        { IMSSP, (SQLCHAR*) "Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectoryServicePrincipal is supported.", -73, false }
     },
     {
         SQLSRV_ERROR_CE_DRIVER_REQUIRED,
diff --git a/source/shared/core_conn.cpp b/source/shared/core_conn.cpp
index 8c90461c9..293cc7905 100644
--- a/source/shared/core_conn.cpp
+++ b/source/shared/core_conn.cpp
@@ -719,7 +719,7 @@ namespace AzureADOptions {
         MAX_AAD_AUTH_TYPE
     };
 
-    const char *AADAuths[] = { "SqlPassword", "ActiveDirectoryPassword", "ActiveDirectoryMsi", "ActiveDirectorySPA" };
+    const char *AADAuths[] = { "SqlPassword", "ActiveDirectoryPassword", "ActiveDirectoryMsi", "ActiveDirectoryServicePrincipal" };
 
     bool isAuthValid(_In_z_ const char* value, _In_ size_t value_len)
     {
diff --git a/source/sqlsrv/util.cpp b/source/sqlsrv/util.cpp
index 0575ab28e..bb57c2d25 100644
--- a/source/sqlsrv/util.cpp
+++ b/source/sqlsrv/util.cpp
@@ -365,7 +365,7 @@ ss_error SS_ERRORS[] = {
     },
 	{
 		SS_SQLSRV_ERROR_INVALID_AUTHENTICATION_OPTION,
-		{ IMSSP, (SQLCHAR*)"Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectorySPA is supported.", -62, false }
+		{ IMSSP, (SQLCHAR*)"Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectoryServicePrincipal is supported.", -62, false }
 	},
     {
         SS_SQLSRV_ERROR_AE_QUERY_SQLTYPE_REQUIRED,
diff --git a/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt b/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt
index 8c06d4bb8..3d5147b53 100644
--- a/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt
@@ -96,5 +96,5 @@ if ($azureServer != 'TARGET_AD_SERVER') {
 Connected successfully with Authentication=SqlPassword.
 string(1) "%d"
 Could not connect with Authentication=ActiveDirectoryIntegrated.
-SQLSTATE[IMSSP]: Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectorySPA is supported.
+SQLSTATE[IMSSP]: Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectoryServicePrincipal is supported.
 %s with Authentication=ActiveDirectoryPassword.
diff --git a/test/functional/pdo_sqlsrv/pdo_azure_ad_service_principal.phpt b/test/functional/pdo_sqlsrv/pdo_azure_ad_service_principal.phpt
index ba24b3ac5..a54ae7ccb 100644
--- a/test/functional/pdo_sqlsrv/pdo_azure_ad_service_principal.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_azure_ad_service_principal.phpt
@@ -62,7 +62,7 @@ function connectAzureDB($showException)
     
     $conn = false;
     try {
-        $connectionInfo = "Database = $adDatabase; Authentication = ActiveDirectorySPA;";
+        $connectionInfo = "Database = $adDatabase; Authentication = ActiveDirectoryServicePrincipal;";
         $conn = new PDO("sqlsrv:server = $adServer; $connectionInfo", $adSPClientId, $adSPClientSecret);
     } catch (PDOException $e) {
         if ($showException) {
@@ -78,7 +78,7 @@ function connectAzureDB($showException)
 // First test connecting to regular sql server
 require_once('MsSetup.inc');
 try {
-    $conn = new PDO("sqlsrv:server = $server; Authentication = ActiveDirectorySPA;", $uid, $pwd);
+    $conn = new PDO("sqlsrv:server = $server; Authentication = ActiveDirectoryServicePrincipal;", $uid, $pwd);
     echo "Expect regular connection to fail\n";
 } catch(PDOException $e) {
     // do nothing
diff --git a/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt b/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
index 90b9f0ab6..5614ab00a 100644
--- a/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
+++ b/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
@@ -106,7 +106,7 @@ Array
     [SQLSTATE] => IMSSP
     [1] => -62
     [code] => -62
-    [2] => Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectorySPA is supported.
-    [message] => Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectorySPA is supported.
+    [2] => Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectoryServicePrincipal is supported.
+    [message] => Invalid option for the Authentication keyword. Only SqlPassword, ActiveDirectoryPassword, ActiveDirectoryMsi or ActiveDirectoryServicePrincipal is supported.
 )
 %s with Authentication=ActiveDirectoryPassword.
diff --git a/test/functional/sqlsrv/sqlsrv_azure_ad_service_principal.phpt b/test/functional/sqlsrv/sqlsrv_azure_ad_service_principal.phpt
index e6daf0e23..58593ee35 100644
--- a/test/functional/sqlsrv/sqlsrv_azure_ad_service_principal.phpt
+++ b/test/functional/sqlsrv/sqlsrv_azure_ad_service_principal.phpt
@@ -70,7 +70,7 @@ function connectAzureDB($showException)
     
     $conn = false;
     $connectionInfo = array("Database"=>$adDatabase, 
-                            "Authentication"=>"ActiveDirectorySPA",
+                            "Authentication"=>"ActiveDirectoryServicePrincipal",
                             "UID"=>$adSPClientId,
                             "PWD"=>$adSPClientSecret);
 
@@ -89,7 +89,7 @@ function connectAzureDB($showException)
 }
 
 // Try connecting to an invalid server. Expect this to fail.
-$connectionInfo = array("Authentication"=>"ActiveDirectorySPA");
+$connectionInfo = array("Authentication"=>"ActiveDirectoryServicePrincipal");
 $conn = sqlsrv_connect('invalidServer', $connectionInfo);
 if ($conn) {
     fatalError("AzureAD Service Principal test: expected to fail with invalidServer\n");