Fix duplicated debugging check.

[privoxy.git] / gateway.c

diff --git a/gateway.c b/gateway.c
index 4b6fab6..76dc32b 100644 (file)
--- a/gateway.c
+++ b/gateway.c
@@ -1,4 +1,4 @@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.36 2008/10/18 19:49:15 fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.39 2008/10/25 11:33:01 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@ -34,6 +34,20 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.36 2008/10/18 19:49:15 fabiankeil
  *
  * Revisions   :
  *    $Log: gateway.c,v $
+ *    Revision 1.39  2008/10/25 11:33:01  fabiankeil
+ *    Remove already out-commented line left over from debugging.
+ *
+ *    Revision 1.38  2008/10/24 17:33:00  fabiankeil
+ *    - Tone the "keep-alive support is experimental" warning
+ *      down a bit as hackish 0-chunk detection has been
+ *      implemented recently.
+ *    - Only show the "ndef HAVE_POLL" warning once on start-up.
+ *
+ *    Revision 1.37  2008/10/23 17:40:53  fabiankeil
+ *    Fix forget_connection() and mark_connection_unused(),
+ *    which would both under certain circumstances access
+ *    reusable_connection[MAX_REUSABLE_CONNECTIONS]. Oops.
+ *
  *    Revision 1.36  2008/10/18 19:49:15  fabiankeil
  *    - Factor close_unusable_connections() out of
  *      get_reusable_connection() to make sure we really check
@@ -335,8 +349,12 @@ extern void initialize_reusable_connections(void)
    unsigned int slot = 0;
 
    log_error(LOG_LEVEL_INFO,
-      "Support for 'Connection: keep-alive' is experimental, "
-      "incomplete and known not to work properly in some situations.");
+      "Support for 'Connection: keep-alive' is experimental."
+#ifndef HAVE_POLL
+      " Detecting already dead connections might not work"
+      " correctly on your platform."
+#endif /* ndef HAVE_POLL */
+   );
 
    for (slot = 0; slot < SZ(reusable_connection); slot++)
    {
@@ -568,10 +586,10 @@ static int connection_destination_matches(const struct reusable_connection *conn
          connection->forward_port, fwd->forward_port, http->host);
       return FALSE;
    }
-   if (connection->forward_port   != fwd->forward_port)
+   if (connection->port != http->port)
    {
       log_error(LOG_LEVEL_CONNECT, "Server port mismatch: %d %d (%s)",
-         connection->forward_port, fwd->forward_port, http->host);
+         connection->port, http->port, http->host);
       return FALSE;
    }
 
@@ -697,7 +715,6 @@ static int socket_is_still_usable(jb_socket sfd)
    int socket_is_alive = 0;
 
    memset(&timeout, '\0', sizeof(timeout));
-   /*   timeout.tv_usec = 150;*/
    FD_ZERO(&readable_fds);
    FD_SET(sfd, &readable_fds);
 
@@ -713,11 +730,6 @@ static int socket_is_still_usable(jb_socket sfd)
     */
    socket_is_alive = !FD_ISSET(sfd, &readable_fds);
 
-   log_error(LOG_LEVEL_INFO,
-      "Detecting already dead sockets might not work correctly "
-      "on your platform. Anyway, socket %d appears to be %s.",
-      sfd, (socket_is_alive ? "still alive" : "already dead"));
-
    return socket_is_alive;
 #endif /* def HAVE_POLL */
 }