From 26fc90054dcfa3b68fc891e9e432fb79741aea9f Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Thu, 18 Nov 2010 12:24:04 +0000
Subject: mod_proxy65: improve connection logging and transfer termination

---
 src/server/mod_proxy65.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/server/mod_proxy65.cpp')

diff --git a/src/server/mod_proxy65.cpp b/src/server/mod_proxy65.cpp
index 851f051c..88037ff8 100644
--- a/src/server/mod_proxy65.cpp
+++ b/src/server/mod_proxy65.cpp
@@ -83,14 +83,20 @@ void QTcpSocketPair::addSocket(QTcpSocket *socket)
 
     if (target)
     {
-        debug("Opened source connection for " + key);
+        debug(QString("Opened source connection for %1 %2:%3").arg(
+            key,
+            socket->peerAddress().toString(),
+            QString::number(socket->peerPort())));
         source = socket;
         source->setReadBufferSize(4 * blockSize);
         connect(source, SIGNAL(disconnected()), this, SLOT(disconnected()));
     }
     else
     {
-        debug("Opened target connection for " + key);
+        debug(QString("Opened target connection for %1 %2:%3").arg(
+            key,
+            socket->peerAddress().toString(),
+            QString::number(socket->peerPort())));
         target = socket;
         connect(target, SIGNAL(disconnected()), this, SLOT(disconnected()));
     }
@@ -132,8 +138,8 @@ void QTcpSocketPair::sendData()
     qint64 length = source->read(buffer, blockSize);
     if (length < 0)
     {
-        warning("Failed to read from source for " + key);
-        target->close();
+        if (!target->bytesToWrite())
+            target->close();
         return;
     }
     if (length > 0)
-- 
cgit v1.2.3