From 13ab2317451931f055855f1aeaec6c8b28b14ce2 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 11 Aug 2020 11:42:15 +0200 Subject: http: Do not use non-blocking local I/O This causes some more issues, really. --- methods/http.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'methods') diff --git a/methods/http.cc b/methods/http.cc index b9e82166c..9c06e030a 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -705,11 +705,6 @@ ResultState HttpServerState::Die(RequestState &Req) // Dump the buffer to the file if (Req.State == RequestState::Data) { - // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking - // can't be set - if (Req.File.Name() != "/dev/null") - SetNonBlock(Req.File.Fd(),false); - if (not In.WriteSpace() || In.IsLimit() == true || Persistent == false) return ResultState::SUCCESSFUL; @@ -753,10 +748,6 @@ bool HttpServerState::Flush(FileFd * const File) { if (File != nullptr) { - // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking - // can't be set - if (File->Name() != "/dev/null") - SetNonBlock(File->Fd(),false); if (In.WriteSpace() == false) return true; @@ -1031,7 +1022,6 @@ BaseHttpMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &R if (Req.StartPos > 0) Res.ResumePoint = Req.StartPos; - SetNonBlock(Req.File.Fd(),true); return FILE_IS_OPEN; } /*}}}*/ -- cgit v1.2.3