Skip to content

Commit 768b473

Browse files
committed
- Fixed spelling error
- CMake regenarates zconf.h in the zlib directory
1 parent 35ef8a7 commit 768b473

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ set(BROTLI_BUNDLED_MODE ON)
3030
set(BROTLI_DISABLE_TESTS TRUE)
3131
set(BUILD_SHARED_LIBS OFF)
3232
mark_as_advanced(BUILD_SHARED_LIBS)
33-
option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" OFF)
34-
option(RENAME_ZCONF "Rename the zconf when building out of source" OFF)
33+
option(ZLIB_INSTALL "Enable installation of zlib" OFF)
34+
option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" OFF)
35+
option(ZLIB_BUILD_SHARED "Enable building zlib shared library" OFF)
36+
option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON)
37+
option(ZLIB_BUILD_MINIZIP "Enable building libminizip contrib library" OFF)
3538

3639
set(SKIP_INSTALL_ALL TRUE)
3740

@@ -48,6 +51,8 @@ add_subdirectory(FastCgi EXCLUDE_FROM_ALL)
4851
add_subdirectory(SocketLib EXCLUDE_FROM_ALL)
4952
add_subdirectory(SrvLib EXCLUDE_FROM_ALL)
5053
add_subdirectory(zlib EXCLUDE_FROM_ALL)
54+
# zconf.h wieder herstellen
55+
file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.included ${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h)
5156

5257
if(UA_ENABLE_ENCRYPTION_OPENSSL)
5358
link_directories(${OPENSSL_LIB_DIR})

HttpFetch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void HttpFetch::Connected(TcpSocket* const pTcpSocket)
129129
{
130130
const long nResult = reinterpret_cast<SslTcpSocket*>(m_pcClientCon)->CheckServerCertificate(m_strServer.c_str());
131131
if (nResult != 0)
132-
OutputDebugString(L"Http2Fetch::Connected Zertifikat not verifyd\r\n");
132+
OutputDebugString(L"Http2Fetch::Connected Zertifikat not verified\r\n");
133133

134134
Protocoll = reinterpret_cast<SslTcpSocket*>(m_pcClientCon)->GetSelAlpnProtocol();
135135
}

0 commit comments

Comments
 (0)