X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=03ee6f2f6a85cacd97a369218f0df67b7a5e1b3d;hp=e4ca6c4200d00d7c05182649cfb066c805050679;hb=2f190a24b298322d5a9190bd7da38199a881b0f6;hpb=8385de7fa201ce05b35dd2d846e042e5b581a02a

diff --git a/jcc.c b/jcc.c
index e4ca6c42..03ee6f2f 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.160 2007/11/29 18:00:29 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.163 2007/12/13 01:47:11 david__schmidt Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,17 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.160 2007/11/29 18:00:29 fabiankeil Exp $"
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.163  2007/12/13 01:47:11  david__schmidt
+ *    Make sure all console-mode apps get a usage() instance
+ *
+ *    Revision 1.162  2007/12/06 17:54:57  fabiankeil
+ *    Reword NO_SERVER_DATA_RESPONSE to make it harder
+ *    to misunderstand what the message is all about.
+ *
+ *    Revision 1.161  2007/12/04 19:44:22  fabiankeil
+ *    Unbreak trustfile which previously didn't work without
+ *    FEATURE_TOGGLE. Fixes BR#1843585, reported by Lee.
+ *
  *    Revision 1.160  2007/11/29 18:00:29  fabiankeil
  *    Plug memory leak. Spotted by Valgrind, triggered by
  *    Privoxy-Regression-Test feeding proxyfuzz.py.
@@ -1049,7 +1060,7 @@ static void build_request_line(struct client_state *csp, const struct forward_sp
 static jb_err change_request_destination(struct client_state *csp);
 static void chat(struct client_state *csp);
 static void serve(struct client_state *csp);
-#if defined(unix)
+#if !defined(_WIN32) || defined(_WIN_CONSOLE)
 static void usage(const char *myname);
 #endif
 static void initialize_mutexes(void);
@@ -1147,7 +1158,7 @@ static const char NO_SERVER_DATA_RESPONSE[] =
    "Content-Type: text/plain\r\n"
    "Connection: close\r\n\r\n"
    "Empty server or forwarder response.\r\n"
-   "The connection was closed without sending any data.\r\n";
+   "The connection has been closed but Privoxy didn't receive any data.\r\n";
 
 #if 0
 /* XXX: should be a template */
@@ -2173,6 +2184,10 @@ static void chat(struct client_state *csp)
            || (csp->action->flags & ACTION_LIMIT_CONNECT
               && !match_portlist(csp->action->string[ACTION_STRING_LIMIT_CONNECT], csp->http->port)) )
       {
+         const char *acceptable_connect_ports =
+            csp->action->string[ACTION_STRING_LIMIT_CONNECT] ?
+            csp->action->string[ACTION_STRING_LIMIT_CONNECT] :
+            "443 (implied default)";
          if (csp->action->flags & ACTION_TREAT_FORBIDDEN_CONNECTS_LIKE_BLOCKS)
          {
             /*
@@ -2184,8 +2199,7 @@ static void chat(struct client_state *csp)
              */
             log_error(LOG_LEVEL_INFO, "Request from %s marked for blocking. "
                "limit-connect{%s} doesn't allow CONNECT requests to port %d.",
-               csp->ip_addr_str, csp->action->string[ACTION_STRING_LIMIT_CONNECT],
-               csp->http->port);
+               csp->ip_addr_str, acceptable_connect_ports, csp->http->port);
             csp->action->flags |= ACTION_BLOCK;
             http->ssl = 0;
          }
@@ -2194,8 +2208,7 @@ static void chat(struct client_state *csp)
             write_socket(csp->cfd, CFORBIDDEN, strlen(CFORBIDDEN));
             log_error(LOG_LEVEL_INFO, "Request from %s denied. "
                "limit-connect{%s} doesn't allow CONNECT requests to port %d.",
-               csp->ip_addr_str, csp->action->string[ACTION_STRING_LIMIT_CONNECT],
-               csp->http->port);
+               csp->ip_addr_str, acceptable_connect_ports, csp->http->port);
             assert(NULL != csp->http->ocmd);
             log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 403 0", csp->ip_addr_str, csp->http->ocmd);
 
@@ -2832,7 +2845,7 @@ static int32 server_thread(void *data)
 #endif
 
 
-#if defined(unix)
+#if !defined(_WIN32) || defined(_WIN_CONSOLE)
 /*********************************************************************
  *
  * Function    :  usage
@@ -2861,7 +2874,7 @@ static void usage(const char *myname)
    exit(2);
 
 }
-#endif /* defined(unix) */
+#endif /* #if !defined(_WIN32) || defined(_WIN_CONSOLE) */
 
 
 /*********************************************************************