X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jbsockets.c;h=76eddf4780451bc0a48117189668f2fcfa4d1daf;hb=a51f4b51843337c9335f6976a1acde693089de18;hp=eb547068905130f72844d12d519f9c16de02bfe4;hpb=0b2f8bed5cd5f8ea2c0a041fe0e3b5395cc31ba6;p=privoxy.git

diff --git a/jbsockets.c b/jbsockets.c
index eb547068..76eddf47 100644
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.109 2011/09/04 11:10:56 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.111 2011/12/10 17:26:30 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -168,7 +168,7 @@ jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
       {
          log_error(LOG_LEVEL_ERROR,
             "Attempt %d of %d to connect to %s failed. Trying again.",
-            forwarded_connect_retries, csp->config->forwarded_connect_retries, host);
+            forwarded_connect_retries, csp->config->forwarded_connect_retries + 1, host);
       }
 
    } while (forwarded_connect_retries < csp->config->forwarded_connect_retries);
@@ -976,6 +976,16 @@ void get_host_information(jb_socket afd, char **ip_address, char **port,
          log_error(LOG_LEVEL_ERROR, "getsockname() truncated server address");
          return;
       }
+/*
+ * XXX: Workaround for missing header on Windows when
+ *      configured with --disable-ipv6-support.
+ *      The proper fix is to not use NI_MAXSERV in
+ *      that case. It works by accident on other platforms
+ *      as <netdb.h> in included unconditionally there.
+ */
+#ifndef NI_MAXSERV
+#define NI_MAXSERV 32
+#endif
       *port = malloc(NI_MAXSERV);
       if (NULL == *port)
       {