Fix a compile error when SSL is disabled.
This commit is contained in:
+2
-1
@@ -51,7 +51,8 @@ CompactNamespaces: false
|
|||||||
ConstructorInitializerAllOnOneLineOrOnePerLine: true
|
ConstructorInitializerAllOnOneLineOrOnePerLine: true
|
||||||
ConstructorInitializerIndentWidth: 4
|
ConstructorInitializerIndentWidth: 4
|
||||||
ContinuationIndentWidth: 4
|
ContinuationIndentWidth: 4
|
||||||
Cpp11BracedListStyle: true
|
# Cpp11BracedListStyle: true
|
||||||
|
Cpp11BracedListStyle: false
|
||||||
DerivePointerAlignment: false
|
DerivePointerAlignment: false
|
||||||
DisableFormat: false
|
DisableFormat: false
|
||||||
ExperimentalAutoDetectBinPacking: false
|
ExperimentalAutoDetectBinPacking: false
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ int main() {
|
|||||||
#endif // WEBCC_ENABLE_SSL
|
#endif // WEBCC_ENABLE_SSL
|
||||||
|
|
||||||
} catch (const webcc::Error& error) {
|
} catch (const webcc::Error& error) {
|
||||||
std::cout << error << std::endl;
|
std::cerr << error << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
+1
-1
@@ -78,7 +78,7 @@ void Client::Connect(RequestPtr request) {
|
|||||||
DoConnect(request, "443");
|
DoConnect(request, "443");
|
||||||
#else
|
#else
|
||||||
LOG_ERRO("SSL/HTTPS support is not enabled.");
|
LOG_ERRO("SSL/HTTPS support is not enabled.");
|
||||||
return kSyntaxError;
|
error_.Set(Error::kSyntaxError, "SSL/HTTPS is not supported");
|
||||||
#endif // WEBCC_ENABLE_SSL
|
#endif // WEBCC_ENABLE_SSL
|
||||||
} else {
|
} else {
|
||||||
socket_.reset(new Socket{ io_context_ });
|
socket_.reset(new Socket{ io_context_ });
|
||||||
|
|||||||
+2
-1
@@ -47,8 +47,9 @@ std::string FromExtension(const std::string& extension,
|
|||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
std::ostream& operator<<(std::ostream& os, const Error& error) {
|
std::ostream& operator<<(std::ostream& os, const Error& error) {
|
||||||
|
os << "ERROR(";
|
||||||
os << std::to_string(static_cast<int>(error.code()));
|
os << std::to_string(static_cast<int>(error.code()));
|
||||||
os << ": " << error.message();
|
os << "): " << error.message();
|
||||||
if (error.timeout()) {
|
if (error.timeout()) {
|
||||||
os << " (timeout)";
|
os << " (timeout)";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ static const bool g_terminal_has_color = []() {
|
|||||||
return strcmp(term, "cygwin") == 0 || strcmp(term, "linux") == 0 ||
|
return strcmp(term, "cygwin") == 0 || strcmp(term, "linux") == 0 ||
|
||||||
strcmp(term, "rxvt-unicode-256color") == 0 ||
|
strcmp(term, "rxvt-unicode-256color") == 0 ||
|
||||||
strcmp(term, "screen") == 0 || strcmp(term, "screen-256color") == 0 ||
|
strcmp(term, "screen") == 0 || strcmp(term, "screen-256color") == 0 ||
|
||||||
|
strcmp(term, "screen.xterm-256color") == 0 ||
|
||||||
strcmp(term, "tmux-256color") == 0 || strcmp(term, "xterm") == 0 ||
|
strcmp(term, "tmux-256color") == 0 || strcmp(term, "xterm") == 0 ||
|
||||||
strcmp(term, "xterm-256color") == 0 ||
|
strcmp(term, "xterm-256color") == 0 ||
|
||||||
strcmp(term, "xterm-termite") == 0 || strcmp(term, "xterm-color") == 0;
|
strcmp(term, "xterm-termite") == 0 || strcmp(term, "xterm-color") == 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user