From c309961109d18216d36464155a6736fc6da8b4f1 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 23 Jan 2021 22:27:53 +0100 Subject: [PATCH] More verbose debugging for HTTP requests. --- src/tl/tl/tlHttpStreamQt.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/tl/tl/tlHttpStreamQt.cc b/src/tl/tl/tlHttpStreamQt.cc index 4d9008f98..ab7c0f981 100644 --- a/src/tl/tl/tlHttpStreamQt.cc +++ b/src/tl/tl/tlHttpStreamQt.cc @@ -297,8 +297,9 @@ void InputHttpStreamPrivateData::close () { if (mp_active_reply.get ()) { - mp_active_reply->abort (); - mp_active_reply.release ()->deleteLater (); + QNetworkReply *reply = mp_active_reply.release (); + reply->abort (); + reply->deleteLater (); } mp_reply = 0; } @@ -343,7 +344,7 @@ InputHttpStreamPrivateData::finished (QNetworkReply *reply) if (tl::verbosity() >= 40) { const QList &raw_headers = reply->rawHeaderPairs (); for (QList::const_iterator h = raw_headers.begin (); h != raw_headers.end (); ++h) { - tl::info << "HTTP response header: " << h->first.constData ()<< ": " << h->second.constData (); + tl::info << "HTTP response header: " << h->first.constData () << ": " << h->second.constData (); } } @@ -383,9 +384,6 @@ InputHttpStreamPrivateData::issue_request (const QUrl &url) tl::info << "HTTP request URL: " << url.toString ().toUtf8 ().constData (); } for (std::map::const_iterator h = m_headers.begin (); h != m_headers.end (); ++h) { - if (tl::verbosity() >= 40) { - tl::info << "HTTP request header: " << h->first << ": " << h->second; - } request.setRawHeader (QByteArray (h->first.c_str ()), QByteArray (h->second.c_str ())); } @@ -397,6 +395,14 @@ InputHttpStreamPrivateData::issue_request (const QUrl &url) #endif #endif + if (tl::verbosity() >= 40) { + tl::info << "HTTP request: " << m_request.constData (); + const QList &raw_headers = request.rawHeaderList (); + for (QList::const_iterator h = raw_headers.begin (); h != raw_headers.end (); ++h) { + tl::info << "HTTP request header: " << h->constData () << ": " << request.rawHeader (*h).constData (); + } + } + #if QT_VERSION < 0x40700 if (m_request == "GET" && m_data.isEmpty ()) { mp_active_reply.reset (s_network_manager->get (request));