Merge remote-tracking branch 'origin/master' into http2-beta

drogonframework · Jun 18, 2024 · 70f1f8f · 70f1f8f
2 parents 29c8540 + a2f759e
commit 70f1f8f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/config.example.yaml b/config.example.yaml
@@ -278,11 +278,11 @@ app:
   client_max_websocket_message_size: 128K
   # reuse_port: Defaults to false, users can run multiple processes listening on the same port at the same time.
   reuse_port: false
-  # enabled_compresed_request: Defaults to false. If true the server will automatically decompress compressed request bodies.
+  # enabled_compressed_request: Defaults to false. If true the server will automatically decompress compressed request bodies.
   # Currently only gzip and br are supported. Note: max_memory_body_size and max_body_size applies twice for compressed requests.
   # Once when receiving and once when decompressing. i.e. if the decompressed body is larger than max_body_size, the request
   # will be rejected.
-  enabled_compresed_request: false
+  enabled_compressed_request: false
 # plugins: Define all plugins running in the application
 plugins:
     # name: The class name of the plugin

diff --git a/drogon_ctl/templates/config_yaml.csp b/drogon_ctl/templates/config_yaml.csp
@@ -278,11 +278,11 @@ app:
   client_max_websocket_message_size: 128K
   # reuse_port: Defaults to false, users can run multiple processes listening on the same port at the same time.
   reuse_port: false
-  # enabled_compresed_request: Defaults to false. If true the server will automatically decompress compressed request bodies.
+  # enabled_compressed_request: Defaults to false. If true the server will automatically decompress compressed request bodies.
   # Currently only gzip and br are supported. Note: max_memory_body_size and max_body_size applies twice for compressed requests.
   # Once when receiving and once when decompressing. i.e. if the decompressed body is larger than max_body_size, the request
   # will be rejected.
-  enabled_compresed_request: false
+  enabled_compressed_request: false
 # plugins: Define all plugins running in the application
 plugins:
     # name: The class name of the plugin

diff --git a/lib/src/AccessLogger.cc b/lib/src/AccessLogger.cc
@@ -367,12 +367,12 @@ void AccessLogger::outputDate(trantor::LogStream &stream,
     {
         if (useLocalTime_)
         {
-            stream << trantor::Date::now().toCustomedFormattedStringLocal(
+            stream << trantor::Date::now().toCustomFormattedStringLocal(
                 timeFormat_, showMicroseconds_);
         }
         else
         {
-            stream << trantor::Date::now().toCustomedFormattedString(
+            stream << trantor::Date::now().toCustomFormattedString(
                 timeFormat_, showMicroseconds_);
         }
     }
@@ -398,12 +398,12 @@ void AccessLogger::outputReqDate(trantor::LogStream &stream,
     {
         if (useLocalTime_)
         {
-            stream << req->creationDate().toCustomedFormattedStringLocal(
+            stream << req->creationDate().toCustomFormattedStringLocal(
                 timeFormat_, showMicroseconds_);
         }
         else
         {
-            stream << req->creationDate().toCustomedFormattedString(
+            stream << req->creationDate().toCustomFormattedString(
                 timeFormat_, showMicroseconds_);
         }
     }

diff --git a/lib/src/Utilities.cc b/lib/src/Utilities.cc
@@ -1039,9 +1039,9 @@ char *getHttpFullDate(const trantor::Date &date)
         return lastTimeString;
     }
     lastSecond = nowSecond;
-    date.toCustomedFormattedString("%a, %d %b %Y %H:%M:%S GMT",
-                                   lastTimeString,
-                                   sizeof(lastTimeString));
+    date.toCustomFormattedString("%a, %d %b %Y %H:%M:%S GMT",
+                                 lastTimeString,
+                                 sizeof(lastTimeString));
     return lastTimeString;
 }
 

diff --git a/trantor b/trantor
+1 −1		.github/workflows/windows-msvc.yml
+4 −0		CMakeLists.txt
+4 −2		trantor/utils/crypto/sha1.cc