Skip to content

Commit 385156c

Browse files
committed
Fix invalid proxy url example
1 parent 602278b commit 385156c

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
@@ -63,7 +63,7 @@ $expected = @(
6363
"error: there were no asset cache hits, and x-block-origin blocks trying the authoritative source https://github\.com/Kitware/CMake/releases/download/[^ ]+",
6464
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
6565
"Possible causes are:",
66-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
66+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
6767
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
6868
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
6969
"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",
@@ -114,7 +114,7 @@ $expected = @(
114114
"error: curl: \(7\) Failed to connect to localhost port 1234( after \d+ ms)?: ((Could not|Couldn't) connect to server|Connection refused)",
115115
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
116116
"Possible causes are:",
117-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
117+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
118118
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
119119
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
120120
"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",
@@ -139,7 +139,7 @@ $expected = @(
139139
"error: curl: \(7\) Failed to connect to localhost port 1235( after \d+ ms)?: ((Could not|Couldn't) connect to server|Connection refused)",
140140
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
141141
"Possible causes are:",
142-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
142+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
143143
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
144144
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
145145
"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",
@@ -251,7 +251,7 @@ $expected = @(
251251
"error: curl: \(7\) Failed to connect to localhost port 1234( after \d+ ms)?: ((Could not|Couldn't) connect to server|Connection refused)",
252252
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
253253
"Possible causes are:",
254-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
254+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
255255
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
256256
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
257257
"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",
@@ -310,7 +310,7 @@ $expected = @(
310310
"error: curl: \(37\) Couldn't open file [^\n]+",
311311
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
312312
"Possible causes are:",
313-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
313+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
314314
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
315315
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
316316
"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",
@@ -374,7 +374,7 @@ $expected = @(
374374
"note: or https://alternate\.example\.com",
375375
"note: If you are using a proxy, please ensure your proxy settings are correct\.",
376376
"Possible causes are:",
377-
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https//address:port``\.",
377+
"1\. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to ``https://address:port``\.",
378378
"This is not correct, because ``https://`` prefix claims the proxy is an HTTPS proxy, while your proxy \(v2ray, shadowsocksr, etc\.\.\.\) is an HTTP proxy\.",
379379
"Try setting ``http://address:port`` to both HTTP_PROXY and HTTPS_PROXY instead\."
380380
"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
@@ -1101,7 +1101,7 @@ DECLARE_MESSAGE(
11011101
"If you are using a proxy, please ensure your proxy settings are correct.\n"
11021102
"Possible causes are:\n"
11031103
"1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to "
1104-
"`https//address:port`.\nThis is not correct, because `https://` prefix claims the proxy is an HTTPS "
1104+
"`https://address:port`.\nThis is not correct, because `https://` prefix claims the proxy is an HTTPS "
11051105
"proxy, while your proxy (v2ray, shadowsocksr, etc...) is an HTTP proxy.\n"
11061106
"Try setting `http://address:port` to both HTTP_PROXY and HTTPS_PROXY instead.\n"
11071107
"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
@@ -622,7 +622,7 @@
622622
"_DownloadFailedHashMismatchExpectedHash.comment": "An example of {sha} is eb32643dd2164c72b8a660ef52f1e701bb368324ae461e12d70d6a9aefc0c9573387ee2ed3828037ed62bb3e8f566416a2d3b3827a3928f0bff7c29f7662293e.",
623623
"DownloadFailedHashMismatchZero": "failing download because the expected SHA512 was all zeros, please change the expected SHA512 to: {sha}",
624624
"_DownloadFailedHashMismatchZero.comment": "An example of {sha} is eb32643dd2164c72b8a660ef52f1e701bb368324ae461e12d70d6a9aefc0c9573387ee2ed3828037ed62bb3e8f566416a2d3b3827a3928f0bff7c29f7662293e.",
625-
"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",
625+
"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",
626626
"DownloadFailedRetrying": "Download {url} failed -- retrying after {value}ms",
627627
"_DownloadFailedRetrying.comment": "{value} is a number of milliseconds An example of {url} is https://github.com/microsoft/vcpkg.",
628628
"DownloadFailedStatusCode": "{url}: failed: status code {value}",

0 commit comments

Comments
 (0)