updated mongoose, spdlog and google tests

opokatech · Aug 1, 2024 · bd7bbf4 · bd7bbf4
1 parent 35c1468
commit bd7bbf4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cmake/externals.cmake b/cmake/externals.cmake
@@ -55,7 +55,7 @@ message(STATUS "${ColorGreen}jsoncpp ready${ColorReset}")
 FetchContent_Declare(
     mongoose
     GIT_REPOSITORY https://github.com/cesanta/mongoose
-    GIT_TAG 7.13
+    GIT_TAG 7.14
     GIT_SHALLOW TRUE
     GIT_PROGRESS TRUE)
 message(STATUS "${ColorYellow}Fetching mongoose...${ColorReset}")
@@ -68,7 +68,7 @@ target_include_directories(mongoose PUBLIC ${mongoose_SOURCE_DIR})
 FetchContent_Declare(
     spdlog
     GIT_REPOSITORY https://github.com/gabime/spdlog.git
-    GIT_TAG v1.12.0
+    GIT_TAG v1.14.1
     GIT_SHALLOW TRUE
     GIT_PROGRESS TRUE)
 
@@ -81,7 +81,7 @@ if(ECB_PARAM_TESTS)
     FetchContent_Declare(
         googletest
         GIT_REPOSITORY https://github.com/google/googletest
-        GIT_TAG v1.14.0
+        GIT_TAG v1.15.2
         GIT_SHALLOW TRUE
         GIT_PROGRESS TRUE)
     message(STATUS "${ColorYellow}Fetching googletest...${ColorReset}")

diff --git a/src/Server_Impl.cpp b/src/Server_Impl.cpp
@@ -47,7 +47,7 @@ bool Server_Impl::is_historical_request(const mg_str *uri) const
     // uri len is the same as the TEMPLATE
     for (size_t pos = 0; pos < uri->len; ++pos)
     {
-        const char c = uri->ptr[pos];
+        const char c = uri->buf[pos];
 
         // All "X" must be a digit, all other characters must match
         if (TEMPLATE[pos] == 'X')
@@ -109,7 +109,7 @@ std::optional<std::string> Server_Impl::get_param_base(const mg_http_message *me
 
     if (var_base.len > 0)
     {
-        auto base = std::string(var_base.ptr, std::min<size_t>(var_base.len, 3u));
+        auto base = std::string(var_base.buf, std::min<size_t>(var_base.len, 3u));
         return Utils::uppercase(base);
     }
     return {};
@@ -123,7 +123,7 @@ std::vector<std::string> Server_Impl::get_param_symbols(const mg_http_message *m
 
     if (var_symbols.len > 0)
     {
-        auto symbols_str = std::string(var_symbols.ptr, std::min<size_t>(var_symbols.len, MAX_SYMBOLS_LEN));
+        auto symbols_str = std::string(var_symbols.buf, std::min<size_t>(var_symbols.len, MAX_SYMBOLS_LEN));
         Utils::uppercase(symbols_str);
         return Utils::split(symbols_str, ',');
     }
@@ -143,7 +143,7 @@ void Server_Impl::handler(mg_connection *connection, int event, void *event_data
 
 void Server_Impl::handle(mg_connection *connection, mg_http_message *message)
 {
-    const bool is_latest = mg_http_match_uri(message, "/api/latest");
+    const bool is_latest = mg_match(message->uri, mg_str("/api/latest"), nullptr);
     const bool is_historical = (!is_latest && is_historical_request(&message->uri));
 
     if (!is_latest && !is_historical)
@@ -157,7 +157,7 @@ void Server_Impl::handle(mg_connection *connection, mg_http_message *message)
     // get time point. In case of historical request, the time point is in the uri /api/XXXX-XX-XX, so
     // we need to extract it skipping the first 5 characters.
     const std::optional<Time_Point> tp =
-        (is_historical) ? std::make_optional(Time_Point{std::string{message->uri.ptr + 5, message->uri.len - 5}})
+        (is_historical) ? std::make_optional(Time_Point{std::string{message->uri.buf + 5, message->uri.len - 5}})
                         : m_rates->last();
 
     if (!tp.has_value())