From 910b50e9f6bb2cd5ce7062beee12d0d0ca0d9394 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Fri, 12 Feb 2021 20:53:00 +0000
Subject: [PATCH] vendored on windows for now

---
 .github/workflows/ci.yml   | 16 ----------------
 Cargo.toml                 | 14 ++++++++++----
 actix-http-test/Cargo.toml |  6 ++++++
 actix-http/Cargo.toml      |  6 ++++++
 awc/Cargo.toml             | 10 +++++-----
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 018f2d324..55af5a380 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,29 +17,13 @@ jobs:
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
         version:
           - 1.46.0 # MSRV
-          - 1.47.0
-          - 1.48.0
-          - 1.49.0
-          - 1.50.0
           - stable
-          - beta
           - nightly
 
     name: ${{ matrix.target.name }} / ${{ matrix.version }}
     runs-on: ${{ matrix.target.os }}
 
     steps:
-      - name: Install Native Dependencies (Windows)
-        if: matrix.target.os == 'windows-latest'
-        run: |
-          curl -fsS -o vcpkg.7z https://rocket.rs/static/vcpkg-2019-07-05.7z
-          7z x vcpkg.7z -y -bb0
-          xcopy .\vcpkg $env:VCPKG_INSTALLATION_ROOT /s /e /h /y /q
-          vcpkg integrate install
-          echo "VCPKGRS_DYNAMIC=1" >> "$env:GITHUB_ENV"
-          echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" >> "$env:GITHUB_ENV"
-          echo "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\lib" >> "$env:GITHUB_PATH"
-
       - uses: actions/checkout@v2
 
       - name: Install ${{ matrix.version }}
diff --git a/Cargo.toml b/Cargo.toml
index 569d1f8c2..b0302b352 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,10 +47,10 @@ compress = ["actix-http/compress", "awc/compress"]
 secure-cookies = ["actix-http/secure-cookies"]
 
 # openssl
-openssl = ["tls_openssl", "actix-tls/accept", "actix-tls/openssl", "awc/openssl"]
+openssl = ["tls-openssl", "actix-tls/accept", "actix-tls/openssl", "awc/openssl"]
 
 # rustls
-rustls = ["tls_rustls", "actix-tls/accept", "actix-tls/rustls", "awc/rustls"]
+rustls = ["tls-rustls", "actix-tls/accept", "actix-tls/rustls", "awc/rustls"]
 
 [[example]]
 name = "basic"
@@ -103,10 +103,16 @@ serde_json = "1.0"
 serde_urlencoded = "0.7"
 time = { version = "0.2.23", default-features = false, features = ["std"] }
 url = "2.1"
-tls_openssl = { package = "openssl", version = "0.10.9", optional = true }
-tls_rustls = { package = "rustls", version = "0.19.0", optional = true }
+tls-openssl = { package = "openssl", version = "0.10.9", optional = true }
+tls-rustls = { package = "rustls", version = "0.19.0", optional = true }
 smallvec = "1.6"
 
+[target.'cfg(windows)'.dependencies.tls-openssl]
+version = "0.10.9"
+package = "openssl"
+features = ["vendored"]
+optional = true
+
 [dev-dependencies]
 actix = { version = "0.11.0-beta.2", default-features = false }
 rand = "0.8"
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 6622e04e0..6dcf73637 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -50,6 +50,12 @@ serde_urlencoded = "0.7"
 time = { version = "0.2.23", default-features = false, features = ["std"] }
 tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
 
+[target.'cfg(windows)'.dependencies.tls-openssl]
+version = "0.10.9"
+package = "openssl"
+features = ["vendored"]
+optional = true
+
 [dev-dependencies]
 actix-web = "4.0.0-beta.3"
 actix-http = "3.0.0-beta.3"
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index c789c3ae5..1915eb1a4 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -94,6 +94,12 @@ serde_derive = "1.0"
 tls-openssl = { version = "0.10", package = "openssl" }
 tls-rustls = { version = "0.19", package = "rustls" }
 
+[target.'cfg(windows)'.dev-dependencies.tls-openssl]
+version = "0.10.9"
+package = "openssl"
+features = ["vendored"]
+optional = true
+
 [[bench]]
 name = "write-camel-case"
 harness = false
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 80c02f997..615a76e09 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -60,11 +60,11 @@ serde_urlencoded = "0.7"
 tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
 tls-rustls = { version = "0.19.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
 
-# [target.'cfg(windows)'.dependencies.tls-openssl]
-# version = "0.10.9"
-# package = "openssl"
-# features = ["vendored"]
-# optional = true
+[target.'cfg(windows)'.dependencies.tls-openssl]
+version = "0.10.9"
+package = "openssl"
+features = ["vendored"]
+optional = true
 
 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.3", features = ["openssl"] }