fix: setting handler to done when read returns 0

Author: StokesAsselborn

src/handler/static_file_handler.cpp

@@ -184,7 +184,7 @@ StaticFileHandler::StaticFileHandler(const std::string& path,
       out_off_(0),
       file_size_(0),
       fd_(-1),
-      eof_(false)
+      done_(false)
 
 {
     struct ResolveResult r;
@@ -207,7 +207,7 @@ StaticFileHandler::StaticFileHandler(const std::string& path,
             HttpResponse::kStatusOk, "text/html; charset=UTF-8", html, req_);
 
         out_buf_ = res_.to_string();
-        eof_ = true;
+        done_ = true;
         return;
     }
 
@@ -245,11 +245,16 @@ size_t StaticFileHandler::read_output(char* buf, size_t n)
         }
     }
     if (fd_ == -1) // safeguard
+    {
+        done_ = true;
         return copied;
+    }
+
     ssize_t bytes = read(fd_, buf + copied, n - copied);
     if (bytes == 0) {
         close(fd_);
         fd_ = -1;
+        done_ = true;
         return copied;
     }
     if (bytes < 0) {
@@ -271,7 +276,7 @@ void StaticFileHandler::set_error(const HttpResponse::Status code)
 {
     res_ = HttpResponse::make_error(code, rc_.shared.error_pages, req_);
     out_buf_ = res_.to_string();
-    eof_ = true;
+    done_ = true;
 }
 
 void StaticFileHandler::set_redirect(const HttpResponse::Status code,
@@ -280,5 +285,5 @@ void StaticFileHandler::set_redirect(const HttpResponse::Status code,
     res_ = HttpResponse::make_response_headers_only(code, "", 0, req_);
     res_.location = redirect_path;
     out_buf_ = res_.to_string();
-    eof_ = true;
+    done_ = true;
 }

src/handler/static_file_handler.hpp

@@ -28,7 +28,7 @@ class StaticFileHandler : public Handler {
     virtual bool is_regular_file() const { return true; }
     virtual bool has_output() const { return out_off_ < out_buf_.size() || fd_ != -1; }
     virtual bool needs_input() const { return false; };
-    virtual bool is_done() const { return eof_ && out_off_ >= out_buf_.size() && fd_ == -1; }
+    virtual bool is_done() const { return done_ && out_off_ >= out_buf_.size() && fd_ == -1; }
 
     virtual int cgi_read_fd() const { return -1; };
     virtual int cgi_write_fd() const { return -1; };
@@ -52,7 +52,7 @@ class StaticFileHandler : public Handler {
     // other handler specifc variables
     off_t file_size_;
     int fd_;
-    bool eof_;
+    bool done_;
 };
 
 #endif