From f806530b9ea858ca6bda8fb8f43d988aba02dab3 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Wed, 28 Jun 2017 13:20:54 +0200
Subject: methods: http: Drain pending data before selecting

GnuTLS can already have data pending in its buffers, we need
to to drain that first otherwise select() might block
indefinitely.

Gbp-Dch: ignore
---
 methods/http.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'methods/http.cc')

diff --git a/methods/http.cc b/methods/http.cc
index 4d8c0808b..b302c896d 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -621,7 +621,15 @@ bool HttpServerState::Go(bool ToFile, RequestState &Req)
    if (ServerFd->Fd() == -1 && (In.WriteSpace() == false ||
 				ToFile == false))
       return false;
-   
+
+   // Handle server IO
+   if (ServerFd->HasPending() && In.ReadSpace() == true)
+   {
+      errno = 0;
+      if (In.Read(ServerFd) == false)
+	 return Die(Req);
+   }
+
    fd_set rfds,wfds;
    FD_ZERO(&rfds);
    FD_ZERO(&wfds);
-- 
cgit v1.2.3