Rebuild after ditching GNUisms in GNUMakefile.in

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index 5a41a02..9acaf26 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.360 2011/07/17 13:36:06 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.362 2011/07/17 13:38:05 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -2261,6 +2261,8 @@ static void chat(struct client_state *csp)
                      "Empty server or forwarder response received on socket %d. "
                      "Closing client socket %d without sending data.",
                      csp->server_connection.sfd, csp->cfd);
+                  log_error(LOG_LEVEL_CLF,
+                     "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
                }
                else
                {
@@ -2269,7 +2271,6 @@ static void chat(struct client_state *csp)
                      csp->server_connection.sfd);
                   send_crunch_response(csp, error_response(csp, "no-server-data"));
                }
-               log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 502 0", csp->ip_addr_str, http->cmd);
                free_http_request(http);
                mark_server_socket_tainted(csp);
                return;
@@ -3346,18 +3347,18 @@ static jb_socket bind_port_helper(const char *haddr, int hport)
       const char *bind_address = (NULL != haddr) ? haddr : "INADDR_ANY";
       switch(result)
       {
-         case -3 :
+         case -3:
             log_error(LOG_LEVEL_FATAL,
                "can't bind to %s:%d: There may be another Privoxy "
                "or some other proxy running on port %d",
                bind_address, hport, hport);
 
-         case -2 :
+         case -2:
             log_error(LOG_LEVEL_FATAL,
                "can't bind to %s:%d: The hostname is not resolvable",
                bind_address, hport);
 
-         default :
+         default:
             log_error(LOG_LEVEL_FATAL, "can't bind to %s:%d: %E",
                bind_address, hport);
       }
@@ -3369,12 +3370,12 @@ static jb_socket bind_port_helper(const char *haddr, int hport)
    if (haddr == NULL)
    {
       log_error(LOG_LEVEL_INFO, "Listening on port %d on all IP addresses",
-                hport);
+         hport);
    }
    else
    {
       log_error(LOG_LEVEL_INFO, "Listening on port %d on IP address %s",
-                hport, haddr);
+         hport, haddr);
    }
 
    return bfd;