publish changes
This commit is contained in:
parent
afc5064a7b
commit
ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
|
@ -18,7 +18,7 @@ else()
|
|||
endif()
|
||||
endif()
|
||||
|
||||
# Avoid the dll boilerplate code for windows
|
||||
# Avoid the dll boilerplate code for arch
|
||||
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||
|
||||
if (PARENT_CXX_STANDARD)
|
||||
|
|
|
@ -9,5 +9,5 @@ if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
|||
set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXECUTABLE};-warnings-as-errors=*")
|
||||
endif()
|
||||
else()
|
||||
message(FATAL_ERROR "Clang-tidy is not supported when building for windows")
|
||||
message(FATAL_ERROR "Clang-tidy is not supported when building for arch")
|
||||
endif()
|
||||
|
|
|
@ -20,7 +20,7 @@ struct Part {
|
|||
Part(const std::string& p_name, const Buffer& buffer, const std::string& p_content_type = {}) : name{p_name}, value{buffer.filename.string()}, content_type{p_content_type}, data{buffer.data}, datalen{buffer.datalen}, is_file{false}, is_buffer{true} {}
|
||||
|
||||
std::string name;
|
||||
// We don't use fs::path here, as this leads to problems using windows
|
||||
// We don't use fs::path here, as this leads to problems using arch
|
||||
std::string value;
|
||||
std::string content_type;
|
||||
Buffer::data_t data{nullptr};
|
||||
|
|
|
@ -413,10 +413,10 @@ class NoRevoke {
|
|||
} // namespace ssl
|
||||
|
||||
struct SslOptions {
|
||||
// We don't use fs::path here, as this leads to problems using windows
|
||||
// We don't use fs::path here, as this leads to problems using arch
|
||||
std::string cert_file;
|
||||
std::string cert_type;
|
||||
// We don't use fs::path here, as this leads to problems using windows
|
||||
// We don't use fs::path here, as this leads to problems using arch
|
||||
std::string key_file;
|
||||
#if SUPPORT_CURLOPT_SSLKEY_BLOB
|
||||
std::string key_blob;
|
||||
|
@ -440,14 +440,14 @@ struct SslOptions {
|
|||
#if SUPPORT_MAX_TLS_VERSION
|
||||
int max_version = CURL_SSLVERSION_MAX_DEFAULT;
|
||||
#endif
|
||||
// We don't use fs::path here, as this leads to problems using windows
|
||||
// We don't use fs::path here, as this leads to problems using arch
|
||||
std::string ca_info;
|
||||
// We don't use fs::path here, as this leads to problems using windows
|
||||
// We don't use fs::path here, as this leads to problems using arch
|
||||
std::string ca_path;
|
||||
#if SUPPORT_CURLOPT_SSL_CTX_FUNCTION
|
||||
std::string ca_buffer;
|
||||
#endif
|
||||
// We don't use fs::path here, as this leads to problems using windows
|
||||
// We don't use fs::path here, as this leads to problems using arch
|
||||
std::string crl_file;
|
||||
std::string ciphers;
|
||||
#if SUPPORT_TLSv13_CIPHERS
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
namespace cpr {
|
||||
class HttpsServer : public AbstractServer {
|
||||
private:
|
||||
// We don't use fs::path here, as this leads to problems using windows
|
||||
// We don't use fs::path here, as this leads to problems using arch
|
||||
const std::string baseDirPath;
|
||||
const std::string sslCertFileName;
|
||||
const std::string sslKeyFileName;
|
||||
|
|
|
@ -1056,7 +1056,7 @@ TEST(LocalPortTests, SetOptionTest) {
|
|||
EXPECT_LE(port_from_response, local_port + local_port_range);
|
||||
}
|
||||
|
||||
// The tests using the port of the server as a source port for curl fail for windows.
|
||||
// The tests using the port of the server as a source port for curl fail for arch.
|
||||
// The reason probably is that Windows allows two sockets to bind to the same port if the full hostname is different.
|
||||
// In these tests, mongoose binds to http://127.0.0.1:61936, while libcurl binds to a different hostname, but still port 61936.
|
||||
// This seems to be okay for Windows, however, these tests expect an error like on Linux and MacOS
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue