summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2020-08-11 11:42:15 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2020-08-11 13:09:04 +0200
commit13ab2317451931f055855f1aeaec6c8b28b14ce2 (patch)
treecb1ac7d668138b6d05cf7b78bb9aa0e93c44a639 /methods
parentaf7ab7c0002ef2cdfb1a4c0a468c5dbbda3d5dd0 (diff)
http: Do not use non-blocking local I/O
This causes some more issues, really.
Diffstat (limited to 'methods')
-rw-r--r--methods/http.cc10
1 files changed, 0 insertions, 10 deletions
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;
}
/*}}}*/