Skip Linux, not affected

Author: absci

appveyor.yml

@@ -101,6 +101,7 @@ build_script:
     - copy %APPVEYOR_BUILD_FOLDER%\buildscripts\*.py c:\projects
     - cd c:\projects
     - python -V
+    - ps:  $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
     - python builddrivers.py --PHPVER=%PHP_VERSION% --ARCH=%BUILD_PLATFORM% --THREAD=%THREAD% --SOURCE=%APPVEYOR_BUILD_FOLDER%\source --TESTING --NO_RENAME
     - cd c:\projects\php-sdk\phpdev\%PHP_VC%\%BUILD_PLATFORM%\php-%PHP_VERSION%-src\
     - set PHP_SRC_DIR=%CD%\ext

azure-pipelines.yml

@@ -217,6 +217,7 @@ jobs:
       for f in pdo_sqlsrv/*.diff; do ls $f 2>/dev/null; cat $f 2>/dev/null; echo ''; done || true
       python output.py
       ls -l *.xml
+      more *.diff | cat
     displayName: 'Processing test results'
 
   - task: PublishTestResults@2

buildscripts/builddrivers.py

@@ -197,12 +197,11 @@ def build(self):
                 ext_dir = self.build_extensions(root_dir, logfile)
                 print('Build Completed')
             except:
-                print('Something went wrong, launching log file', logfile)
-                # display log file only when not testing
-                if not self.testing:
-                    logfile_path = os.path.join(root_dir, 'php-sdk', logfile)
-                    with open(logfile_path, 'r') as f:
-                        print(f.read())
+                print('Something went wrong, Print logfile to terminal', logfile)
+                # logfile_path = os.path.join(root_dir, 'php-sdk', logfile)
+                with open("C:\\projects\\php-sdk\\" + logfile, 'r') as f:
+                    f.seek(0)
+                    print(f.read())
                 os.chdir(work_dir)
                 exit(1)
             if not self.testing:

source/pdo_sqlsrv/config.w32

@@ -27,10 +27,10 @@ if( PHP_PDO_SQLSRV != "no" ) {
     if (CHECK_LIB("odbc32.lib", "pdo_sqlsrv") && CHECK_LIB("odbccp32.lib", "pdo_sqlsrv") && 
         CHECK_LIB("version.lib", "pdo_sqlsrv") && CHECK_LIB("psapi.lib", "pdo_sqlsrv")&&
         CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_PDO_SQLSRV", configure_module_dirname + "\\shared")) {
-            CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_PDO_SQLSRV_ODBC");
-            CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_PDO_SQLSRV_ODBC");
             CHECK_HEADER_ADD_INCLUDE("php_pdo_sqlsrv_int.h", "CFLAGS_PDO_SQLSRV", configure_module_dirname);
             CHECK_HEADER_ADD_INCLUDE("php_pdo_sqlsrv.h", "CFLAGS_PDO_SQLSRV", configure_module_dirname);
+            CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_PDO_SQLSRV_ODBC");
+            CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_PDO_SQLSRV_ODBC");
             ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "pdo_sqlsrv" );
             ADD_FLAG( "LDFLAGS_PDO_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug /guard:cf" );
             ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/EHsc" );

source/pdo_sqlsrv/pdo_init.cpp

@@ -249,15 +249,15 @@ PHP_RSHUTDOWN_FUNCTION(pdo_sqlsrv)
 {
     // SQLSRV_UNUSED( module_number );
     // SQLSRV_UNUSED( type );
-
+#ifdef _WIN32
     for (size_t current_token = 0; current_token < PDO_SQLSRV_G(access_tokens_size); current_token++) {
         if (PDO_SQLSRV_G(access_tokens)[current_token]) {
             memset(PDO_SQLSRV_G(access_tokens)[current_token]->data, 0, PDO_SQLSRV_G(access_tokens)[current_token]->dataSize);
             sqlsrv_free(PDO_SQLSRV_G(access_tokens)[current_token]);
         }
     }
     sqlsrv_free(PDO_SQLSRV_G(access_tokens));
-
+#endif
     PDO_LOG_NOTICE("pdo_sqlsrv: entering rshutdown");
 
     return SUCCESS;

source/pdo_sqlsrv/php_pdo_sqlsrv.h

@@ -21,7 +21,10 @@
 //---------------------------------------------------------------------------------------------------------------------------------
 
 #include "php.h"
+
+#ifdef _WIN32
 #include "msodbcsql.h"
+#endif
 //*********************************************************************************************************************************
 // Global variables
 //*********************************************************************************************************************************
@@ -32,11 +35,12 @@ ZEND_BEGIN_MODULE_GLOBALS(pdo_sqlsrv)
 unsigned int pdo_log_severity;
 zend_long client_buffer_max_size;
 short report_additional_errors;
-ACCESSTOKEN** access_tokens;
-unsigned int access_tokens_size = 0;
 
 #ifndef _WIN32
 zend_long set_locale_info;
+#else
+ACCESSTOKEN** access_tokens;
+unsigned int access_tokens_size = 0;
 #endif
 
 ZEND_END_MODULE_GLOBALS(pdo_sqlsrv)

source/shared/core_conn.cpp

@@ -32,12 +32,12 @@
 #ifndef _WIN32
 #include <sys/utsname.h>
 #include <odbcinst.h>
-#endif
-
+#else
 extern "C" {
 #include "php_pdo_sqlsrv.h"
 }
 #include "php_pdo_sqlsrv_int.h"
+#endif
 
 // *** internal variables and constants ***
 
@@ -1187,7 +1187,7 @@ void access_token_set_func::func( _In_ connection_option const* option, _In_ zva
     // similar to a UCS-2 string containing only ASCII characters
     //
     // See https://docs.microsoft.com/sql/connect/odbc/using-azure-active-directory#authenticating-with-an-access-token
-
+#ifdef _WIN32
     size_t next_token_position = 0;
     bool same_token_used = false;
 
@@ -1205,6 +1205,7 @@ void access_token_set_func::func( _In_ connection_option const* option, _In_ zva
             break;
         }
     }
+#endif
 
     size_t dataSize = 2 * value_len;
 
@@ -1227,11 +1228,12 @@ void access_token_set_func::func( _In_ connection_option const* option, _In_ zva
     // Save the pointer because SQLDriverConnect() will use it to make connection to the server
     conn->azure_ad_access_token = pAccToken;
     accToken.transferred();
-
+#ifdef _WIN32
     if (!same_token_used) {
         next_token_position = PDO_SQLSRV_G(access_tokens_size);
         PDO_SQLSRV_G(access_tokens_size)++;
         PDO_SQLSRV_G(access_tokens) = reinterpret_cast<ACCESSTOKEN**>(sqlsrv_realloc(PDO_SQLSRV_G(access_tokens), PDO_SQLSRV_G(access_tokens_size) * sizeof(ACCESSTOKEN)));
     }
     PDO_SQLSRV_G(access_tokens)[next_token_position] = conn->azure_ad_access_token;
+#endif
 }