etr · etr · May 21, 2023 · May 13, 2023 · May 13, 2023 · May 13, 2023
diff --git a/src/http_request.cpp b/src/http_request.cpp
@@ -301,7 +301,7 @@ std::ostream &operator<< (std::ostream &os, const http_request &r) {
 }
 
 http_request::~http_request() {
-    for ( const auto &file_key : this->get_files() ) {
+    for ( const auto &file_key : get_files() ) {
         for ( const auto &files : file_key.second ) {
             // C++17 has std::filesystem::remove()
             remove(files.second.get_file_system_file_name().c_str());

diff --git a/src/httpserver/create_webserver.hpp b/src/httpserver/create_webserver.hpp
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <memory>
 #include <functional>
+#include <limits>
 #include <string>
 
 #include "httpserver/http_response.hpp"
@@ -363,7 +364,7 @@ class create_webserver {
      int _max_threads = 0;
      int _max_connections = 0;
      int _memory_limit = 0;
-     size_t _content_size_limit = static_cast<size_t>(-1);
+     size_t _content_size_limit = std::numeric_limits<size_t>::max();
      int _connection_timeout = DEFAULT_WS_TIMEOUT;
      int _per_IP_connection_limit = 0;
      log_access_ptr _log_access = nullptr;

diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
@@ -34,6 +34,7 @@
 #include <stddef.h>
 #include <algorithm>
 #include <iosfwd>
+#include <limits>
 #include <map>
 #include <memory>
 #include <string>
@@ -98,7 +99,7 @@ class http_request {
      **/
      const std::string get_path_piece(int index) const {
          std::vector<std::string> post_path = get_path_pieces();
-         if ((static_cast<int>((post_path.size()))) > index) {
+         if (static_cast<int>(post_path.size()) > index) {
              return post_path[index];
          }
          return EMPTY;
@@ -256,11 +257,11 @@ class http_request {
      /**
       * Default constructor of the class. It is a specific responsibility of apis to initialize this type of objects.
      **/
-     http_request() : cache(std::make_unique<http_request_data_cache>()) {}
+     http_request() = default;
 
      http_request(MHD_Connection* underlying_connection, unescaper_ptr unescaper):
          underlying_connection(underlying_connection),
-         unescaper(unescaper), cache(std::make_unique<http_request_data_cache>()) {}
+         unescaper(unescaper) {}
 
      /**
       * Copy constructor. Deleted to make class move-only. The class is move-only for several reasons:
@@ -292,7 +293,7 @@ class http_request {
      std::string method;
      std::map<std::string, std::map<std::string, http::file_info>> files;
      std::string content = "";
-     size_t content_size_limit = static_cast<size_t>(-1);
+     size_t content_size_limit = std::numeric_limits<size_t>::max();
      std::string version;
 
      struct MHD_Connection* underlying_connection = nullptr;
@@ -390,7 +391,7 @@ class http_request {
      **/
      void set_args(const std::map<std::string, std::string>& args) {
          for (auto const& [key, value] : args) {
-             this->cache->unescaped_args[key].push_back(value.substr(0, content_size_limit));
+             cache->unescaped_args[key].push_back(value.substr(0, content_size_limit));
          }
      }
 
@@ -410,7 +411,7 @@ class http_request {
         std::string digested_user;
         std::map<std::string, std::vector<std::string>, http::arg_comparator> unescaped_args;
      };
-     std::unique_ptr<http_request_data_cache> cache;
+     std::unique_ptr<http_request_data_cache> cache = std::make_unique<http_request_data_cache>();
      // Populate the data cache unescaped_args
      void populate_args() const;
 

diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -82,7 +82,7 @@ struct generateFilenameException : public std::exception {
      }
 
      const char* what() const noexcept {
-          return this->error_message.c_str();
+          return error_message.c_str();
      }
 
  private:

diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -82,7 +82,7 @@ namespace httpserver {
 
 MHD_Result policy_callback(void *, const struct sockaddr*, socklen_t);
 void error_log(void*, const char*, va_list);
-void* uri_log(void*, const char*);
+void* uri_log(void*, const char*, struct MHD_Connection *con);
 void access_log(webserver*, string);
 size_t unescaper_func(void*, struct MHD_Connection*, char*);
 
@@ -418,9 +418,10 @@ MHD_Result policy_callback(void *cls, const struct sockaddr* addr, socklen_t add
     return MHD_YES;
 }
 
-void* uri_log(void* cls, const char* uri) {
+void* uri_log(void* cls, const char* uri, struct MHD_Connection *con) {
     // Parameter needed to respect MHD interface, but not needed here.
     std::ignore = cls;
+    std::ignore = con;
 
     struct details::modded_request* mr = new details::modded_request();
     mr->complete_uri = new string(uri);

diff --git a/test/integ/basic.cpp b/test/integ/basic.cpp
@@ -284,9 +284,7 @@ class error_resource : public http_resource {
 
 class print_request_resource : public http_resource {
  public:
-     explicit print_request_resource(stringstream* ss) {
-         this->ss = ss;
-     }
+     explicit print_request_resource(stringstream* ss) : ss(ss) {}
 
      shared_ptr<http_response> render_GET(const http_request& req) {
          (*ss) << req;
@@ -299,9 +297,7 @@ class print_request_resource : public http_resource {
 
 class print_response_resource : public http_resource {
  public:
-     explicit print_response_resource(stringstream* ss) {
-         this->ss = ss;
-     }
+     explicit print_response_resource(stringstream* ss) : ss(ss) {}
 
      shared_ptr<http_response> render_GET(const http_request&) {
          shared_ptr<string_response> hresp(new string_response("OK", 200, "text/plain"));