From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 20 Jul 2010 13:09:51 +0000 (+1200)
Subject: Make http.cc use io.fd instead of member FD on errors/timeout
X-Git-Tag: take08~55^2~124^2~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49ae8b951953f94005a5ea905530829e96e6fd45;p=thirdparty%2Fsquid.git

Make http.cc use io.fd instead of member FD on errors/timeout
---

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);
     }