From a72fc5e4335a382820d49f053579066618b9bbca Mon Sep 17 00:00:00 2001 From: antao Date: Tue, 4 Dec 2018 17:11:39 +0800 Subject: [PATCH] Update the configuration file --- config.example.json | 39 +++++++++++++++++++-------------- drogon_ctl/templates/config.csp | 15 ++++++------- lib/src/HttpAppFrameworkImpl.cc | 8 +++++-- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/config.example.json b/config.example.json index 30c4eb18..d9329e86 100644 --- a/config.example.json +++ b/config.example.json @@ -25,8 +25,8 @@ "cert": "", "key": "" } - ],*/ - "db_clients":[ + ], + "db_clients": [ { //name:Name of the client,'default' by default //"name":"", @@ -43,21 +43,21 @@ //passwd:'' by default "passwd": "", //connection_number:1 by default - "connection_number":1 + "connection_number": 1 } - ], + ],*/ "app": { //threads_num:num of threads,1 by default "threads_num": 16, //enable_session:false by default - "enable_session": true, - "session_timeout": 1200, + "enable_session": false, + "session_timeout": 0, //document_root:Root path of HTTP document,defaut path is ./ "document_root": "./", //upload_path: The path to save the uploaded file. "uploads" by default. - //If the path isn't prefixed with / or ./, + //If the path isn't prefixed with /, ./ or ../, //it will be relative path of document_root path - "upload_path":"uploads", + "upload_path": "uploads", /* file_types: * HTTP download file types,The file types supported by drogon * by default are "html", "js", "css", "xml", "xsl", "txt", "svg", @@ -84,10 +84,10 @@ //Load_dynamic_views: false by default, when set to true, drogon will //compile and load dynamically "CSP View Files" in directories defined //by "dynamic_views_path" - //"load_dynamic_views":true, - //dynamic_views_path: if the path isn't prefixed with / or ./, + "load_dynamic_views":false, + //dynamic_views_path: if the path isn't prefixed with /, ./ or ../, //it will be relative path of document_root path - //"dynamic_views_path":["./views"], + "dynamic_views_path":["./views"], //log:set log output,drogon output logs to stdout by default "log": { //log_path:log file path,empty by default,in which case,log will output to the stdout @@ -100,7 +100,7 @@ "log_size_limit": 100000000, //log_level:"DEBUG" by default,options:"TRACE","DEBUG","INFO","WARN" //The TRACE level is only valid when built in DEBUG mode. - "log_level": "TRACE" + "log_level": "DEBUG" }, //run_as_daemon:false by default "run_as_daemon": false, @@ -111,7 +111,7 @@ "use_sendfile": true, //use_gzip:true by default,use gzip to compress the response body's content; "use_gzip": true, - //static_files_cache_time:5 by default,the time in which static file response is cached, + //static_files_cache_time:5 (seconds) by default,the time in which static file response is cached, //0 means cache forever,the negative value means no cache "static_files_cache_time": 5, //simple_controllers_map:Configuring mapping from path to simple controller @@ -119,12 +119,17 @@ { "path": "/path/name", "controller": "controllerClassName", - "http_methods": ["get","post"], - "filters": ["FilterClassName"] + "http_methods": [ + "get", + "post" + ], + "filters": [ + "FilterClassName" + ] } ], //idle_connection_timeout: defaults to 60 seconds, the lifetime //of the connection without read or write - "idle_connection_timeout":60 + "idle_connection_timeout": 60 } -} +} \ No newline at end of file diff --git a/drogon_ctl/templates/config.csp b/drogon_ctl/templates/config.csp index 108b0574..d9329e86 100644 --- a/drogon_ctl/templates/config.csp +++ b/drogon_ctl/templates/config.csp @@ -25,8 +25,7 @@ "cert": "", "key": "" } - ],*/ - /* + ], "db_clients": [ { //name:Name of the client,'default' by default @@ -56,9 +55,9 @@ //document_root:Root path of HTTP document,defaut path is ./ "document_root": "./", //upload_path: The path to save the uploaded file. "uploads" by default. - //If the path isn't prefixed with / or ./, + //If the path isn't prefixed with /, ./ or ../, //it will be relative path of document_root path - "upload_path":"uploads", + "upload_path": "uploads", /* file_types: * HTTP download file types,The file types supported by drogon * by default are "html", "js", "css", "xml", "xsl", "txt", "svg", @@ -85,14 +84,14 @@ //Load_dynamic_views: false by default, when set to true, drogon will //compile and load dynamically "CSP View Files" in directories defined //by "dynamic_views_path" - //"load_dynamic_views":true, - //dynamic_views_path: if the path isn't prefixed with / or ./, + "load_dynamic_views":false, + //dynamic_views_path: if the path isn't prefixed with /, ./ or ../, //it will be relative path of document_root path - //"dynamic_views_path":["./views"], + "dynamic_views_path":["./views"], //log:set log output,drogon output logs to stdout by default "log": { //log_path:log file path,empty by default,in which case,log will output to the stdout - "log_path": "./", + //"log_path": "./", //logfile_base_name:log file base name,empty by default which means drogon will name logfile as //drogon.log ... "logfile_base_name": "", diff --git a/lib/src/HttpAppFrameworkImpl.cc b/lib/src/HttpAppFrameworkImpl.cc index 9d8f6447..5417920f 100755 --- a/lib/src/HttpAppFrameworkImpl.cc +++ b/lib/src/HttpAppFrameworkImpl.cc @@ -88,7 +88,9 @@ void HttpAppFrameworkImpl::enableDynamicViewsLoading(const std::vector= 2 && libpath[0] == '.' && libpath[1] == '/')) + (libpath.length() >= 2 && libpath[0] == '.' && libpath[1] == '/') || + (libpath.length() >= 3 && libpath[0] == '.' && libpath[1] == '.' && libpath[2] == '/') || + libpath == "." || libpath == "..") { _libFilePaths.push_back(libpath); } @@ -686,7 +688,9 @@ void HttpAppFrameworkImpl::setUploadPath(const std::string &uploadPath) { assert(!uploadPath.empty()); if (uploadPath[0] == '/' || - (uploadPath.length() >= 2 && uploadPath[0] == '.' && uploadPath[1] == '/')) + (uploadPath.length() >= 2 && uploadPath[0] == '.' && uploadPath[1] == '/') || + (uploadPath.length() >= 3 && uploadPath[0] == '.' && uploadPath[1] == '.' && uploadPath[2] == '/') || + uploadPath == "." || uploadPath == "..") { _uploadPath = uploadPath; }