From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 26 Aug 2013 19:09:40 +0000 (-0600)
Subject: Support %<st and %<sh logformat codes for FTP gateway responses.
X-Git-Tag: SQUID_3_5_0_1~117^2~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23cba51d94f34a31e5e69e0a7eada62cd12c96fe;p=thirdparty%2Fsquid.git

Support %<st and %<sh logformat codes for FTP gateway responses.

For logging purposes, treat all non-data FTP responses (i.e., bytes written on
the client control connection) as "HTTP headers" because they are similar
"matadata".
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 10a0d49ff2..d60a16490e 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -5263,6 +5263,9 @@ FtpWroteReplyData(const Comm::ConnectionPointer &conn, char *bufnotused, size_t
         return;
     }
 
+    assert(context->http);
+    context->http->out.size += size;
+
     switch (context->socketState()) {
     case STREAM_NONE:
         debugs(33, 3, "Keep going");
@@ -5419,6 +5422,12 @@ FtpWroteEarlyReply(const Comm::ConnectionPointer &conn, char *bufnotused, size_t
     }
 
     ConnStateData *const connState = static_cast<ConnStateData*>(data);
+    ClientSocketContext::Pointer context = connState->getCurrentContext();
+    if (context != NULL && context->http) {
+        context->http->out.size += size;
+        context->http->out.headers_sz += size;
+    }
+
     connState->flags.readMore = true;
     connState->readSomeData();
 }
@@ -5440,6 +5449,10 @@ FtpWroteReply(const Comm::ConnectionPointer &conn, char *bufnotused, size_t size
         static_cast<ClientSocketContext*>(data);
     ConnStateData *const connState = context->getConn();
 
+    assert(context->http);
+    context->http->out.size += size;
+    context->http->out.headers_sz += size;
+
     if (connState->ftp.state == ConnStateData::FTP_ERROR) {
         debugs(33, 5, "closing on FTP server error");
         conn->close();