- 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.

diff --git a/gateway.c b/gateway.c
index 4b6fab6..f62ce2a 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.37 2008/10/23 17:40:53 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.c,v $


@@ -34,6 +34,11 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.36 2008/10/18 19:49:15 fabiankeil
  *
  * Revisions   :
  *    $Log: gateway.c,v $
  *
  * Revisions   :
  *    $Log: gateway.c,v $

+ *    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
  *    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 +340,12 @@ extern void initialize_reusable_connections(void)
    unsigned int slot = 0;
 
    log_error(LOG_LEVEL_INFO,
    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++)
    {
 
    for (slot = 0; slot < SZ(reusable_connection); slot++)
    {


@@ -713,11 +722,6 @@ static int socket_is_still_usable(jb_socket sfd)
     */
    socket_is_alive = !FD_ISSET(sfd, &readable_fds);
 
     */
    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 */
 }
    return socket_is_alive;
 #endif /* def HAVE_POLL */
 }