From 49ae8b951953f94005a5ea905530829e96e6fd45 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 21 Jul 2010 01:09:51 +1200 Subject: [PATCH] Make http.cc use io.fd instead of member FD on errors/timeout --- src/comm/Connection.h | 1 + src/http.cc | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/comm/Connection.h b/src/comm/Connection.h index c32901a3f0..23209c3662 100644 --- a/src/comm/Connection.h +++ b/src/comm/Connection.h @@ -37,6 +37,7 @@ #ifndef _SQUIDCONNECTIONDETAIL_H_ #define _SQUIDCONNECTIONDETAIL_H_ +#include "comm/forward.h" #include "hier_code.h" #include "ip/Address.h" #include "RefCount.h" diff --git a/src/http.cc b/src/http.cc index c57440c6fb..5fcb152ae6 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1418,7 +1418,6 @@ HttpStateData::maybeReadVirginBody() void HttpStateData::sendComplete(const CommIoCbParams &io) { - assert(serverConnection->fd == io.fd); debugs(11, 5, "httpSendComplete: FD " << serverConnection->fd << ": size " << io.size << ": errflag " << io.flag << "."); #if URL_CHECKSUM_DEBUG @@ -1426,7 +1425,7 @@ HttpStateData::sendComplete(const CommIoCbParams &io) #endif if (io.size > 0) { - fd_bytes(serverConnection->fd, io.size, FD_WRITE); + fd_bytes(io.fd, io.size, FD_WRITE); kb_incr(&statCounter.server.all.kbytes_out, io.size); kb_incr(&statCounter.server.http.kbytes_out, io.size); } -- 2.47.2