From c209b7248fb8de115592b630e583f3af5254d248 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Fri, 24 Aug 2018 15:31:13 -0700
Subject: [PATCH] Enabled Spectre Mitigations (#836)

---
 source/pdo_sqlsrv/config.w32 | 3 +++
 source/sqlsrv/config.w32     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/source/pdo_sqlsrv/config.w32 b/source/pdo_sqlsrv/config.w32
index 7066e6254..a71e329d8 100644
--- a/source/pdo_sqlsrv/config.w32
+++ b/source/pdo_sqlsrv/config.w32
@@ -36,6 +36,9 @@ if( PHP_PDO_SQLSRV != "no" ) {
             ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/Zi" );
             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("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 449789c4b..2972a7b19 100644
--- a/source/sqlsrv/config.w32
+++ b/source/sqlsrv/config.w32
@@ -35,6 +35,9 @@ if( PHP_SQLSRV != "no" ) {
             ADD_FLAG( "CFLAGS_SQLSRV", "/EHsc" );
             ADD_FLAG( "CFLAGS_SQLSRV", "/GS" );
             ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" );
+            if (VCVERS >= 1913) {
+                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 {