Skip to content

Commit d570b23

Browse files
committed
Fix invalid proxy url example
1 parent 1cc117b commit d570b23

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

azure-pipelines/end-to-end-tests-dir/asset-caching.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ $expected = @(
6464
"error: there were no asset cache hits, and x-block-origin blocks trying the authoritative source https://github\.com/Kitware/CMake/releases/download/[^ ]+",
6565
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
6666
"Possible causes are:",
67-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
67+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
6868
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
6969
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
7070
"2\. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software\. See: https://github\.com/microsoft/vcpkg-tool/pull/77",
@@ -116,7 +116,7 @@ $expected = @(
116116
"error: Not a transient network error, won't retry download from https://localhost:1234/foobar\.html",
117117
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
118118
"Possible causes are:",
119-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
119+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
120120
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
121121
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
122122
"2\. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software\. See: https://github\.com/microsoft/vcpkg-tool/pull/77",
@@ -143,7 +143,7 @@ $expected = @(
143143
"error: Not a transient network error, won't retry download from https://localhost:1235/baz\.html",
144144
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
145145
"Possible causes are:",
146-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
146+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
147147
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
148148
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
149149
"2\. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software\. See: https://github\.com/microsoft/vcpkg-tool/pull/77",
@@ -235,7 +235,7 @@ $expected = @(
235235
"error: Not a transient network error, won't retry download from https://localhost:1234/foobar\.html",
236236
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
237237
"Possible causes are:",
238-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
238+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
239239
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
240240
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
241241
"2\. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software\. See: https://github\.com/microsoft/vcpkg-tool/pull/77",
@@ -298,7 +298,7 @@ $expected = @(
298298
"note: Actual : 65077997890f66f6041bb3284bb7b88e27631411ccbc253201ca4e00c4bcc58c0d77edffda4975498797cc10772c7fd68fbeb13cc4ac493a3471a9d49e5b6f24",
299299
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
300300
"Possible causes are:",
301-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
301+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
302302
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
303303
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
304304
"2\. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software\. See: https://github\.com/microsoft/vcpkg-tool/pull/77",
@@ -360,7 +360,7 @@ $expected = @(
360360
"note: or https://alternate\.example\.com",
361361
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
362362
"Possible causes are:",
363-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
363+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
364364
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
365365
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
366366
"2\. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software\. See: https://github\.com/microsoft/vcpkg-tool/pull/77",

include/vcpkg/base/message-data.inc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ DECLARE_MESSAGE(
10911091
"If you are using a proxy, please ensure your proxy settings are correct.\n"
10921092
"Possible causes are:\n"
10931093
"1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to "
1094-
"`https//address:port`.\nThis is not correct, because `https://` prefix claims the proxy is an HTTPS "
1094+
"`https://address:port`.\nThis is not correct, because `https://` prefix claims the proxy is an HTTPS "
10951095
"proxy, while your proxy (v2ray, shadowsocksr, etc...) is an HTTP proxy.\n"
10961096
"Try setting `http://address:port` to both HTTP_PROXY and HTTPS_PROXY instead.\n"
10971097
"2. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your "

locales/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621
"_DownloadFailedHashMismatchExpectedHash.comment": "An example of {sha} is eb32643dd2164c72b8a660ef52f1e701bb368324ae461e12d70d6a9aefc0c9573387ee2ed3828037ed62bb3e8f566416a2d3b3827a3928f0bff7c29f7662293e.",
622622
"DownloadFailedHashMismatchZero": "failing download because the expected SHA512 was all zeros, please change the expected SHA512 to: {sha}",
623623
"_DownloadFailedHashMismatchZero.comment": "An example of {sha} is eb32643dd2164c72b8a660ef52f1e701bb368324ae461e12d70d6a9aefc0c9573387ee2ed3828037ed62bb3e8f566416a2d3b3827a3928f0bff7c29f7662293e.",
624-
"DownloadFailedProxySettings": "If you are using a proxy, please ensure your proxy settings are correct.\nPossible causes are:\n1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to `https//address:port`.\nThis is not correct, because `https://` prefix claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr, etc...) is an HTTP proxy.\nTry setting `http://address:port` to both HTTP_PROXY and HTTPS_PROXY instead.\n2. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software. See: https://github.com/microsoft/vcpkg-tool/pull/77\nThe value set by your proxy might be wrong, or have same `https://` prefix issue.\n3. Your proxy's remote server is out of service.\nIf you believe this is not a temporary download server failure and vcpkg needs to be changed to download this file from a different location, please submit an issue to https://github.com/Microsoft/vcpkg/issues",
624+
"DownloadFailedProxySettings": "If you are using a proxy, please ensure your proxy settings are correct.\nPossible causes are:\n1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to `https://address:port`.\nThis is not correct, because `https://` prefix claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr, etc...) is an HTTP proxy.\nTry setting `http://address:port` to both HTTP_PROXY and HTTPS_PROXY instead.\n2. If you are using Windows, vcpkg will automatically use your Windows IE Proxy Settings set by your proxy software. See: https://github.com/microsoft/vcpkg-tool/pull/77\nThe value set by your proxy might be wrong, or have same `https://` prefix issue.\n3. Your proxy's remote server is out of service.\nIf you believe this is not a temporary download server failure and vcpkg needs to be changed to download this file from a different location, please submit an issue to https://github.com/Microsoft/vcpkg/issues",
625625
"DownloadFailedStatusCode": "{url}: failed: status code {value}",
626626
"_DownloadFailedStatusCode.comment": "{value} is an HTTP status code An example of {url} is https://github.com/microsoft/vcpkg.",
627627
"DownloadNotTransientErrorWontRetry": "Not a transient network error, won't retry download from {url}",

0 commit comments

Comments
 (0)