Merge branch 'drogonframework:master' into master

Author: JuergenGleiss

.github/workflows/cmake.yml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        osver: [13, 14, 15]
+        osver: [14, 15]
     steps:
       - name: Checkout Drogon source code
         uses: actions/checkout@v4
@@ -175,12 +175,12 @@ jobs:
           sudo apt-get --purge remove postgresql postgresql-doc postgresql-common postgresql-client-common
           sudo apt-get -y install postgresql-all
 
-      - name: Install g++-13
-        if: startsWith(matrix.compiler.cxx, 'g++') && matrix.compiler.ver == 13
+      - name: Install g++
+        if: startsWith(matrix.compiler.cxx, 'g++') && (matrix.compiler.ver == 13 || matrix.compiler.ver == 9)
         run: |
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test
           sudo apt-get install g++-${{ matrix.compiler.ver }}
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${{ matrix.compiler.ver }} ${{ matrix.compiler.ver }}
 
       - name: Install Clang
         if: startsWith(matrix.compiler.cxx, 'clang') && matrix.compiler.ver < 13

.github/workflows/codeql.yml

@@ -60,7 +60,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -75,6 +75,6 @@ jobs:
       run: ninja && sudo ninja install
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

cmake_modules/FindHiredis.cmake

@@ -38,4 +38,8 @@ if(Hiredis_FOUND)
             "${HIREDIS_INCLUDE_DIRS}"
             INTERFACE_LINK_LIBRARIES
             "${HIREDIS_LIBRARIES}")
-endif(Hiredis_FOUND)
+endif(Hiredis_FOUND)
+
+if(WIN32 AND MINGW)
+        target_link_libraries(Hiredis_lib INTERFACE ws2_32 secur32 crypt32 bcrypt zstd curl shlwapi)
+endif()

lib/src/CacheFile.cc

@@ -36,6 +36,8 @@ CacheFile::CacheFile(const std::string &path, bool autoDelete)
         file_ = nullptr;
     }
 #endif
+    if (!file_)
+        LOG_SYSERR << "CacheFile fopen:";
 }
 
 CacheFile::~CacheFile()
@@ -63,7 +65,10 @@ CacheFile::~CacheFile()
 void CacheFile::append(const char *data, size_t length)
 {
     if (file_)
-        fwrite(data, length, 1, file_);
+    {
+        if (!fwrite(data, length, 1, file_))
+            LOG_SYSERR << "CacheFile append:";
+    }
 }
 
 size_t CacheFile::length()
@@ -95,7 +100,7 @@ char *CacheFile::data()
         if (data_ == MAP_FAILED)
         {
             data_ = nullptr;
-            LOG_SYSERR << "mmap:";
+            LOG_SYSERR << "CacheFile mmap:";
         }
     }
     return data_;