From 69e82080ea19f633d56c49b983984f8828fc675c Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Tue, 13 Nov 2018 15:33:07 -0800
Subject: [PATCH] Modified config files to add the compiler flag, /Qspectre
 (#878)

---
 appveyor.yml                 |  2 +-
 source/pdo_sqlsrv/config.w32 |  9 ++++++++-
 source/sqlsrv/config.w32     | 11 +++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4a0fcbddd..ee9f2eb37 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ environment:
         SQL_INSTANCE: SQL2017
         PHP_VC: 15
         PHP_MAJOR_VER: 7.2
-        PHP_MINOR_VER: latest
+        PHP_MINOR_VER: 11
         PHP_EXE_PATH: x64\Release_TS
         THREAD: ts
         platform: x64
diff --git a/source/pdo_sqlsrv/config.w32 b/source/pdo_sqlsrv/config.w32
index cd6e3a063..8b8e4f29a 100644
--- a/source/pdo_sqlsrv/config.w32
+++ b/source/pdo_sqlsrv/config.w32
@@ -37,8 +37,15 @@ if( PHP_PDO_SQLSRV != "no" ) {
             if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/guard:cf /O2" );
             ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" );
             if (VCVERS >= 1913) {
+                ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
                 ADD_FLAG("CFLAGS_PDO_SQLSRV", "/Qspectre");
-            } 
+            } else if (VCVERS == 1900) {
+                var subver1900 = probe_binary(PHP_CL).substr(6);
+                if (subver1900 >= 24241) {
+                    ADD_FLAG("LDFLAGS_PDO_SQLSRV", "/d2:-guardspecload");
+                    ADD_FLAG('CFLAGS_PDO_SQLSRV', "/Qspectre");
+                }
+            }
             ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo');
             EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
     } else {
diff --git a/source/sqlsrv/config.w32 b/source/sqlsrv/config.w32
index b6c2b1b1a..e4cd19d01 100644
--- a/source/sqlsrv/config.w32
+++ b/source/sqlsrv/config.w32
@@ -36,11 +36,18 @@ if( PHP_SQLSRV != "no" ) {
             ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
             ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
             if (VCVERS >= 1913) {
+                ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
                 ADD_FLAG("CFLAGS_SQLSRV", "/Qspectre");
-            } 
+            } else if (VCVERS == 1900) {
+                var subver1900 = probe_binary(PHP_CL).substr(6);
+                if (subver1900 >= 24241) {
+                    ADD_FLAG("LDFLAGS_SQLSRV", "/d2:-guardspecload");
+                    ADD_FLAG('CFLAGS_SQLSRV', "/Qspectre");
+                }
+            }
             if (PHP_DEBUG != "yes") ADD_FLAG( "CFLAGS_SQLSRV", "/guard:cf /O2" );
             EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
     } else {
         WARNING("sqlsrv not enabled; libraries and headers not found");
-	}
+    }
 }