aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Rutger Broekhoff2024-05-02 20:45:59 +0200
committerLibravatar Rutger Broekhoff2024-05-02 20:45:59 +0200
commitcb1702080cff86b5ab5a3375d8bf90bf2d004f6d (patch)
treee47720e91d21de894830a4cb8cc38e2430a1b495
parent17a3ea880402338420699e03bcb24181e4ff3924 (diff)
downloadoeuf-cb1702080cff86b5ab5a3375d8bf90bf2d004f6d.tar.gz
oeuf-cb1702080cff86b5ab5a3375d8bf90bf2d004f6d.zip
Fix some word salad (it just happens sometimes)
-rw-r--r--src/bundleparquet/spliturl.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bundleparquet/spliturl.cpp b/src/bundleparquet/spliturl.cpp
index 90fd821..f5328a9 100644
--- a/src/bundleparquet/spliturl.cpp
+++ b/src/bundleparquet/spliturl.cpp
@@ -14,7 +14,7 @@
14// splits it into two URLs: 14// splits it into two URLs:
15// - scheme + host -> '[http[s]://]HOST' 15// - scheme + host -> '[http[s]://]HOST'
16// - port + path -> '[PORT][/PATH]' 16// - port + path -> '[PORT][/PATH]'
17// In case an IPv6 address is provided, the host must enclosed in square 17// In case an IPv6 address is provided, the host must be enclosed in square
18// brackets. The zone ID may also be indicated. Note that in the resulting 18// brackets. The zone ID may also be indicated. Note that in the resulting
19// parts, the colon preceding the port number is omitted. This is on purpose. 19// parts, the colon preceding the port number is omitted. This is on purpose.
20std::optional<SplitUrl> splitUrl(const std::string &url, std::string *error) { 20std::optional<SplitUrl> splitUrl(const std::string &url, std::string *error) {
@@ -44,8 +44,9 @@ std::optional<SplitUrl> splitUrl(const std::string &url, std::string *error) {
44 // As we parse the URL with the option CURLU_DEFAULT_SCHEME, the CURL API 44 // As we parse the URL with the option CURLU_DEFAULT_SCHEME, the CURL API
45 // won't require the user to provide the scheme part of the URL. It will 45 // won't require the user to provide the scheme part of the URL. It will
46 // automatically default the scheme to https. However, we do not usually want 46 // automatically default the scheme to https. However, we do not usually want
47 // it to default to HTTPS, but HTTP instead (as the use case, connecting to a 47 // it to default to HTTPS, but HTTP instead. (In this specific use case of
48 // PushGateway server, usually is served over a private network via HTTP). 48 // connecting to a PushGateway server, we assume that the PushGateway server
49 // is available over a trusted network, and only using unsecured HTTP).
49 // 50 //
50 // This is why we check if the scheme was put there by CURL and otherwise set 51 // This is why we check if the scheme was put there by CURL and otherwise set
51 // it to HTTP. We also check for any other schemes that the user may have 52 // it to HTTP. We also check for any other schemes that the user may have