Skip to content

Commit

Permalink
http: Do not use non-blocking local I/O
Browse files Browse the repository at this point in the history
This causes some more issues, really.
  • Loading branch information
julian-klode committed Aug 11, 2020
1 parent af7ab7c commit 13ab231
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions methods/http.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
/*}}}*/
Expand Down

0 comments on commit 13ab231

Please sign in to comment.