From 89a007b16096a3ba6a8a4e637d4b7639fbb151a1 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 16 Mar 2021 06:40:21 +0000
Subject: [PATCH 1/3] unvendor openssl

---
 actix-tls/Cargo.toml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml
index 354bb42875..d14c65ac46 100755
--- a/actix-tls/Cargo.toml
+++ b/actix-tls/Cargo.toml
@@ -62,12 +62,6 @@ webpki-roots = { version = "0.21", optional = true }
 # native-tls
 tokio-native-tls = { version = "0.3", optional = true }
 
-[target.'cfg(windows)'.dependencies.tls-openssl]
-version = "0.10.9"
-package = "openssl"
-features = ["vendored"]
-optional = true
-
 [dev-dependencies]
 actix-rt = "2.1.0"
 actix-server = "2.0.0-beta.3"

From 7f5a70f6233289ecba10aa1aeb98e28eaf43e4e7 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 16 Mar 2021 07:22:10 +0000
Subject: [PATCH 2/3] fix windows ci

---
 .github/workflows/ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b5b47c408..ae952ef84e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,9 @@ jobs:
     name: ${{ matrix.target.name }} / ${{ matrix.version }}
     runs-on: ${{ matrix.target.os }}
 
+    env:
+      VCPKGRS_DYNAMIC: 1
+
     steps:
       - name: Setup Routing
         if: matrix.target.os == 'macos-latest'
@@ -32,6 +35,14 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      # install OpenSSL on Windows
+      - name: Set vcpkg root
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc' || matrix.target.triple == 'i686-pc-windows-msvc'
+        run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+      - name: Install OpenSSL
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc' || matrix.target.triple == 'i686-pc-windows-msvc'
+        run: vcpkg install openssl:x64-windows
+
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1
         with:

From aee19114fee9f97776fa16c5791de022253f5398 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 17 Mar 2021 00:02:07 +0000
Subject: [PATCH 3/3] fix ci

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae952ef84e..2bb9a234ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,8 +40,11 @@ jobs:
         if: matrix.target.triple == 'x86_64-pc-windows-msvc' || matrix.target.triple == 'i686-pc-windows-msvc'
         run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
       - name: Install OpenSSL
-        if: matrix.target.triple == 'x86_64-pc-windows-msvc' || matrix.target.triple == 'i686-pc-windows-msvc'
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
         run: vcpkg install openssl:x64-windows
+      - name: Install OpenSSL
+        if: matrix.target.triple == 'i686-pc-windows-msvc'
+        run: vcpkg install openssl:x86-windows
 
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1