bwi/v2.3.0 #29

Merged
bartoszek merged 38 commits from bwi/v2.3.0 into main 2025-09-11 08:32:43 +00:00
Showing only changes of commit 6747caa56c - Show all commits

View File

@ -87,7 +87,7 @@ class WebSocket {
log(LogLevel::Debug, "WebSocket using proxy");
// "username:password\@server:port"
proxyUrl.reserve(conservative_estimate(cfg.proxyUsername, cfg.proxyPass, cfg.proxyHost, cfg.proxyPort) + 10);
proxyUrl.reserve(conservative_estimate(cfg.proxyUsername, cfg.proxyPass, cfg.proxyHost) + 10);
if(cfg.proxyAuthRequired) {
proxyUrl += *cfg.proxyUsername;
proxyUrl += ":";
@ -96,15 +96,7 @@ class WebSocket {
}
proxyUrl += *cfg.proxyHost;
if(cfg.proxyPort.value_or(0) > 0) {
proxyUrl += ":";
proxyUrl += std::to_string(*cfg.proxyPort);
}
// Set environment variable for libwebsockets to pick up
log(LogLevel::Debug, "WebSocket proxy %s", proxyUrl.c_str());
info.http_proxy_address = proxyUrl.c_str();
info.http_proxy_port = config.proxyPort.value_or(8080);
}