Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.10)
project(NWNX-Unified)

if(NOT CMAKE_BUILD_TYPE)
Expand Down
2 changes: 1 addition & 1 deletion NWNXLib/External/funchook/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# GIT_SHALLOW requires cmake 3.6.
cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 3.10)

project(funchook VERSION 2.0.0 LANGUAGES C ASM)

Expand Down
2 changes: 1 addition & 1 deletion Plugins/Redis/cpp_redis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
###
# config
###
cmake_minimum_required(VERSION 2.8.7)
cmake_minimum_required(VERSION 3.10)
set(CMAKE_MACOSX_RPATH 1)
include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)

Expand Down
2 changes: 1 addition & 1 deletion Plugins/Redis/cpp_redis/tacopie/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
###
# config
###
cmake_minimum_required(VERSION 2.8.7)
cmake_minimum_required(VERSION 3.10)
set(CMAKE_MACOSX_RPATH 1)
include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)

Expand Down
13 changes: 13 additions & 0 deletions Plugins/SQL/Targets/MySQL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@ namespace SQL {
MySQL::MySQL()
{
mysql_init(&m_mysql);
/*
SSL_CTX_set0_tmp_dh_pkey() might seg fault in WSL2 (probably also WSL1, too) environment.

To prevent that from happening, disable SSL with:
NWNX_SQL_SSL_DISABLED=true

NOTE: this generally should not be needed, but e.g. in my case MySQL/SSL segfaults.
*/
if (Config::Get<bool>("SSL_DISABLED", false))
{
uint use_ssl = SSL_MODE_DISABLED;
mysql_options(&m_mysql, MYSQL_OPT_SSL_MODE, (uint const*)&use_ssl);
}
m_stmt = nullptr;
m_lastError = "";
m_paramCount = 0;
Expand Down