From: wessels <>
Date: Wed, 4 Jan 2006 01:54:32 +0000 (+0000)
Subject: Bug in FwdState destructor.  Go back to using a temporary FD value
X-Git-Tag: SQUID_3_0_PRE4~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f451100287b5ace41f472d71198c4ee8cc670f;p=thirdparty%2Fsquid.git

Bug in FwdState destructor.  Go back to using a temporary FD value
when closing server_fd.
---

diff --git a/src/forward.cc b/src/forward.cc
index 2bbba16781..9be87584f3 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.133 2006/01/03 17:22:31 wessels Exp $
+ * $Id: forward.cc,v 1.134 2006/01/03 18:54:32 wessels Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -122,11 +122,13 @@ FwdState::~FwdState()
 
     entry = NULL;
 
-    if (server_fd > -1) {
-        comm_remove_close_handler(server_fd, fwdServerClosedWrapper, this);
+    int fd = server_fd;
+
+    if (fd > -1) {
         server_fd = -1;
-        debug(17, 3) ("fwdStateFree: closing FD %d\n", server_fd);
-        comm_close(server_fd);
+        comm_remove_close_handler(fd, fwdServerClosedWrapper, this);
+        debug(17, 3) ("fwdStateFree: closing FD %d\n", fd);
+        comm_close(fd);
     }
 
     debugs(17, 3, HERE << "FwdState destructor done");