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/connect.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'methods/connect.cc')

diff --git a/methods/connect.cc b/methods/connect.cc
index c40f34f2d..e48008214 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -98,6 +98,10 @@ struct FdFd : public MethodFd
    }
 };
 
+bool MethodFd::HasPending()
+{
+   return false;
+}
 std::unique_ptr<MethodFd> MethodFd::FromFd(int iFd)
 {
    FdFd *fd = new FdFd();
@@ -626,6 +630,11 @@ struct TlsFd : public MethodFd
 	 return -1;
       return UnderlyingFd->Close();
    }
+
+   bool HasPending() APT_OVERRIDE
+   {
+      return gnutls_record_check_pending(session) > 0;
+   }
 };
 
 bool UnwrapTLS(std::string Host, std::unique_ptr<MethodFd> &Fd,
-- 
cgit v1.2.3