hno squid-2.4.DEVEL3-hno.devel.sslReadClient_read_failure_log_leve.patch

Minor adjustment of sslReadClient log levels

diff --git a/src/ssl.cc b/src/ssl.cc
index 8d6a776a692e3ef1e28255ab8dbfb407182f3254..eabfb7265a0827044d9f1f86515496f3d85f018f 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.105 2000/05/12 00:29:08 wessels Exp $
+ * $Id: ssl.cc,v 1.106 2000/05/30 09:27:18 hno Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -246,7 +246,14 @@ sslReadClient(int fd, void *data)
     }
     cbdataLock(sslState);
     if (len < 0) {
-       debug(50, ECONNRESET == errno ? 3 : 1) ("sslReadClient: FD %d: read failure: %s\n",
+       int level = 1;
+#ifdef ECONNRESET
+       if (errno == ECONNRESET)
+           level = 2;
+#endif
+       if (ignoreErrno(errno))
+           level = 3;
+       debug(50, level) ("sslReadClient: FD %d: read failure: %s\n",
            fd, xstrerror());
        if (!ignoreErrno(errno))
            comm_close(fd);

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 0977222ae5aeacbf50303c1434c994d9e61107af..55ccc6ffa371d05e356b28ecb58c05b4563828a5 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.105 2000/05/12 00:29:08 wessels Exp $
+ * $Id: tunnel.cc,v 1.106 2000/05/30 09:27:18 hno Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -246,7 +246,14 @@ sslReadClient(int fd, void *data)
     }
     cbdataLock(sslState);
     if (len < 0) {
-       debug(50, ECONNRESET == errno ? 3 : 1) ("sslReadClient: FD %d: read failure: %s\n",
+       int level = 1;
+#ifdef ECONNRESET
+       if (errno == ECONNRESET)
+           level = 2;
+#endif
+       if (ignoreErrno(errno))
+           level = 3;
+       debug(50, level) ("sslReadClient: FD %d: read failure: %s\n",
            fd, xstrerror());
        if (!ignoreErrno(errno))
            comm_close(fd);