Merge branch 'master' into release_script

examples/CMakeLists.txt

@@ -65,6 +65,10 @@ else ()
   target_compile_options(example_chat PRIVATE "${compiler_options}")
   target_link_libraries(example_chat PUBLIC ${REQUIRED_LIBRARIES})
 
+  add_executable(example_static_file example_static_file.cpp)
+  target_compile_options(example_static_file PRIVATE "${compiler_options}")
+  target_link_libraries(example_static_file PUBLIC ${REQUIRED_LIBRARIES})
+
   add_executable(example_catchall example_catchall.cpp)
   target_compile_options(example_catchall PRIVATE "${compiler_options}")
   target_link_libraries(example_catchall PUBLIC ${REQUIRED_LIBRARIES})

examples/example_static_file.cpp

@@ -1,5 +1,6 @@
 //#define CROW_STATIC_DRIECTORY "alternative_directory/"
 //#define CROW_STATIC_ENDPOINT "/alternative_endpoint/<path>"
+//#define CROW_DISABLE_STATIC_DIR
 #define CROW_MAIN
 #include "crow.h"
 

examples/example_with_all.cpp

@@ -42,7 +42,7 @@ int main()
         return crow::response(os.str());
     });
 
-    // example which uses only response as a paramter wihtout
+    // example which uses only response as a paramter without
     // request being a parameter.
     CROW_ROUTE(app,"/add/<int>/<int>")
     ([](crow::response& res, int a, int b){

examples/websocket/example_ws.cpp

@@ -8,7 +8,7 @@ int main()
 {
     crow::SimpleApp app;
 
-    std::mutex mtx;;
+    std::mutex mtx;
     std::unordered_set<crow::websocket::connection*> users;
 
     CROW_ROUTE(app, "/ws")

include/crow/app.h

@@ -213,8 +213,8 @@ namespace crow
               res.set_static_file_info(CROW_STATIC_DIRECTORY + file_path_partial);
               res.end();
             });
-            validate();
 #endif
+            validate();
 
 #ifdef CROW_ENABLE_SSL
             if (use_ssl_)