Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2025-05-06 17:51:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash if a file gets deleted but still registered.

Browse Source
This commit is contained in:
Relintai 2020-11-25 13:22:43 +01:00
parent 4364fb9da8
commit 3694db51b3
7 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
,gitignore
View File

@ -1,2 +1,3 @@
bin/*
bin/**

10
framework/application.cpp
View File

@ -95,6 +95,14 @@ void Application::send_file(const std::string &path, Request *request) {
std::string fp = FileCache::get_instance()->wwwroot + path; std::string fp = FileCache::get_instance()->wwwroot + path;
FILE *f = fopen(fp.c_str(), "rb"); FILE *f = fopen(fp.c_str(), "rb");
if (!f) {
printf("Error: Registered file doesn't exists anymore! %s\n", path.c_str());
send_error(404, request);
return;
}
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
long fsize = ftell(f); long fsize = ftell(f);
fseek(f, 0, SEEK_SET); /* same as rewind(f); */ fseek(f, 0, SEEK_SET); /* same as rewind(f); */
@ -105,6 +113,8 @@ void Application::send_file(const std::string &path, Request *request) {
fread(&body[0], 1, fsize, f); fread(&body[0], 1, fsize, f);
fclose(f); fclose(f);
//TODO set mimetype?
request->response->setBody(body); request->response->setBody(body);
request->finalized = true; request->finalized = true;
} }

2
framework/file_cache.cpp
View File

@ -13,7 +13,7 @@ void FileCache::deregister_file(const std::string &file_path) {
} }
bool FileCache::has_file(const std::string &file_path) { bool FileCache::has_file(const std::string &file_path) {
return registered_files.find(file_path) != registered_files.end(); return registered_files.find(file_path) != registered_files.end();
} }
void FileCache::refresh() { void FileCache::refresh() {

2
framework/file_cache.h
View File

@ -8,6 +8,8 @@ class FileCache {
public: public:
std::string wwwroot; std::string wwwroot;
//Note: file path should be the url you want to access the file with, inculding lead slash
//e.g. http://127.0.0.1/a/b/d.jpg -> /a/b/d.jpg
void register_file(const std::string &file_path); void register_file(const std::string &file_path);
void deregister_file(const std::string &file_path); void deregister_file(const std::string &file_path);

1
www/aaaa/qdeq.html
View File

@ -1 +0,0 @@
ffqfqfq

1
www/asd.html
View File

@ -1 +0,0 @@
qqq

4
www/index.html
View File

@ -1,7 +1,5 @@
<html> <html>
<body> <body>
<p>dadadada</p> <p>Welcome</p>
</body> </body>
</html> </html>